Peter Deiml / gammalib

Commit 743c5c528978f5f656c47464d1926688cc6fc0ca

Authored by Jürgen Knödlseder
1 parent d32e8946

Put MajorRadius before MinorRadius in the parameter stack. 

This appears more natural for an ellipse.
Inline Side-by-side
Showing 1 changed file with 13 additions and 13 deletions
src/model/GModelSpatialElliptical.cpp
  View file @743c5c5
@@ -467,17 +467,6 @@ void GModelSpatialElliptical::init_members(void) @@ -467,17 +467,6 @@ void GModelSpatialElliptical::init_members(void)
467 m_posangle.gradient(0.0); 467 m_posangle.gradient(0.0);
468 m_posangle.has_grad(false); 468 m_posangle.has_grad(false);
469 469
470 - // Initialise semi-minor axis  
471 - m_semiminor.clear();  
472 - m_semiminor.name("MinorRadius");  
473 - m_semiminor.unit("deg");  
474 - m_semiminor.value(2.778e-4); // 1 arcsec  
475 - m_semiminor.min(2.778e-4); // 1 arcsec  
476 - m_semiminor.free();  
477 - m_semiminor.scale(1.0);  
478 - m_semiminor.gradient(0.0);  
479 - m_semiminor.has_grad(false); // Elliptical components never have gradients  
480 -  
481 // Initialise semi-major axis 470 // Initialise semi-major axis
482 m_semimajor.clear(); 471 m_semimajor.clear();
483 m_semimajor.name("MajorRadius"); 472 m_semimajor.name("MajorRadius");
@@ -489,13 +478,24 @@ void GModelSpatialElliptical::init_members(void) @@ -489,13 +478,24 @@ void GModelSpatialElliptical::init_members(void)
489 m_semimajor.gradient(0.0); 478 m_semimajor.gradient(0.0);
490 m_semimajor.has_grad(false); // Elliptical components never have gradients 479 m_semimajor.has_grad(false); // Elliptical components never have gradients
491 480
  481 + // Initialise semi-minor axis
  482 + m_semiminor.clear();
  483 + m_semiminor.name("MinorRadius");
  484 + m_semiminor.unit("deg");
  485 + m_semiminor.value(2.778e-4); // 1 arcsec
  486 + m_semiminor.min(2.778e-4); // 1 arcsec
  487 + m_semiminor.free();
  488 + m_semiminor.scale(1.0);
  489 + m_semiminor.gradient(0.0);
  490 + m_semiminor.has_grad(false); // Elliptical components never have gradients
  491 +
492 // Set parameter pointer(s) 492 // Set parameter pointer(s)
493 m_pars.clear(); 493 m_pars.clear();
494 m_pars.push_back(&m_ra); 494 m_pars.push_back(&m_ra);
495 m_pars.push_back(&m_dec); 495 m_pars.push_back(&m_dec);
496 m_pars.push_back(&m_posangle); 496 m_pars.push_back(&m_posangle);
497 - m_pars.push_back(&m_semiminor);  
498 m_pars.push_back(&m_semimajor); 497 m_pars.push_back(&m_semimajor);
  498 + m_pars.push_back(&m_semiminor);
499 499
500 // Return 500 // Return
501 return; 501 return;
@@ -521,8 +521,8 @@ void GModelSpatialElliptical::copy_members(const GModelSpatialElliptical& model) @@ -521,8 +521,8 @@ void GModelSpatialElliptical::copy_members(const GModelSpatialElliptical& model)
521 m_pars.push_back(&m_ra); 521 m_pars.push_back(&m_ra);
522 m_pars.push_back(&m_dec); 522 m_pars.push_back(&m_dec);
523 m_pars.push_back(&m_posangle); 523 m_pars.push_back(&m_posangle);
524 - m_pars.push_back(&m_semiminor);  
525 m_pars.push_back(&m_semimajor); 524 m_pars.push_back(&m_semimajor);
  525 + m_pars.push_back(&m_semiminor);
526 526
527 // Return 527 // Return
528 return; 528 return;