Commit 089a5f7bbb51b9785e4fd60e86416558ab84792c
1 parent
e9e77922
Update GModelTemporalPhaseCurve (ctools #1982)
When constructing a "GModelTemporalPhaseCurve" object from a "GXmlElement" object, removed allowance for an empty "file" attribute. Extended the default [min,max] range for F1 and F2 from [0,1000] to [-1000,1000].
Showing
1 changed file
with
3 additions
and
5 deletions
src/model/GModelTemporalPhaseCurve.cpp
| ... | ... | @@ -370,9 +370,7 @@ void GModelTemporalPhaseCurve::read(const GXmlElement& xml) |
| 370 | 370 | m_f2.read(*f2); |
| 371 | 371 | |
| 372 | 372 | // Load nodes from file |
| 373 | - if (xml.attribute("file").size() != 0) { | |
| 374 | - load_nodes(gammalib::xml_file_expand(xml, xml.attribute("file"))); | |
| 375 | - } | |
| 373 | + load_nodes(gammalib::xml_file_expand(xml, xml.attribute("file"))); | |
| 376 | 374 | |
| 377 | 375 | // Return |
| 378 | 376 | return; |
| ... | ... | @@ -583,7 +581,7 @@ void GModelTemporalPhaseCurve::init_members(void) |
| 583 | 581 | m_f1.unit("s^-2"); |
| 584 | 582 | m_f1.scale(1.0); |
| 585 | 583 | m_f1.value(0.1); |
| 586 | - m_f1.range(0.0,1000.0); | |
| 584 | + m_f1.range(-1000.0,1000.0); | |
| 587 | 585 | m_f1.free(); |
| 588 | 586 | m_f1.gradient(0.0); |
| 589 | 587 | m_f1.has_grad(false); |
| ... | ... | @@ -594,7 +592,7 @@ void GModelTemporalPhaseCurve::init_members(void) |
| 594 | 592 | m_f2.unit("s^-3"); |
| 595 | 593 | m_f2.scale(1.0); |
| 596 | 594 | m_f2.value(0.01); |
| 597 | - m_f2.range(0.0,1000.0); | |
| 595 | + m_f2.range(-1000.0,1000.0); | |
| 598 | 596 | m_f2.free(); |
| 599 | 597 | m_f2.gradient(0.0); |
| 600 | 598 | m_f2.has_grad(false); | ... | ... |