Commit d7f2ec06967f91bfe3af661939ff80f0d53ec023

Authored by Jürgen Knödlseder
1 parent d8959026

Remove front/back switch as the section is now stored in the m_evtype member.

inst/lat/include/GLATAeff.hpp
@@ -100,8 +100,6 @@ private: @@ -100,8 +100,6 @@ private:
100 GLATResponseTable m_aeff_bins; //!< Aeff energy and cos theta binning 100 GLATResponseTable m_aeff_bins; //!< Aeff energy and cos theta binning
101 std::vector<double> m_aeff; //!< Aeff array 101 std::vector<double> m_aeff; //!< Aeff array
102 double m_min_ctheta; //!< Minimum valid cos(theta) 102 double m_min_ctheta; //!< Minimum valid cos(theta)
103 - bool m_front; //!< Response is for front section  
104 - bool m_back; //!< Response is for back section  
105 GLATEfficiency* m_eff_func1; //!< Efficiency functor 1 103 GLATEfficiency* m_eff_func1; //!< Efficiency functor 1
106 GLATEfficiency* m_eff_func2; //!< Efficiency functor 2 104 GLATEfficiency* m_eff_func2; //!< Efficiency functor 2
107 }; 105 };
inst/lat/src/GLATAeff.cpp
@@ -463,16 +463,7 @@ std::string GLATAeff::print(const GChatter&amp; chatter) const @@ -463,16 +463,7 @@ std::string GLATAeff::print(const GChatter&amp; chatter) const
463 gammalib::str(nenergies())); 463 gammalib::str(nenergies()));
464 result.append("\n"+gammalib::parformat("Number of cos theta bins") + 464 result.append("\n"+gammalib::parformat("Number of cos theta bins") +
465 gammalib::str(ncostheta())); 465 gammalib::str(ncostheta()));
466 - result.append("\n"+gammalib::parformat("Detector section"));  
467 - if (m_front) {  
468 - result.append("front");  
469 - }  
470 - else if (m_back) {  
471 - result.append("back");  
472 - }  
473 - else {  
474 - result.append("unknown");  
475 - } 466 + result.append("\n"+gammalib::parformat("Detector section")+m_evtype);
476 result.append("\n"+gammalib::parformat("Efficiency factors")); 467 result.append("\n"+gammalib::parformat("Efficiency factors"));
477 if (has_efficiency()) { 468 if (has_efficiency()) {
478 result.append("present"); 469 result.append("present");
@@ -504,8 +495,6 @@ void GLATAeff::init_members(void) @@ -504,8 +495,6 @@ void GLATAeff::init_members(void)
504 m_aeff_bins.clear(); 495 m_aeff_bins.clear();
505 m_aeff.clear(); 496 m_aeff.clear();
506 m_min_ctheta = 0.0; 497 m_min_ctheta = 0.0;
507 - m_front = false;  
508 - m_back = false;  
509 m_eff_func1 = NULL; 498 m_eff_func1 = NULL;
510 m_eff_func2 = NULL; 499 m_eff_func2 = NULL;
511 500
@@ -526,8 +515,6 @@ void GLATAeff::copy_members(const GLATAeff&amp; aeff) @@ -526,8 +515,6 @@ void GLATAeff::copy_members(const GLATAeff&amp; aeff)
526 m_aeff_bins = aeff.m_aeff_bins; 515 m_aeff_bins = aeff.m_aeff_bins;
527 m_aeff = aeff.m_aeff; 516 m_aeff = aeff.m_aeff;
528 m_min_ctheta = aeff.m_min_ctheta; 517 m_min_ctheta = aeff.m_min_ctheta;
529 - m_front = aeff.m_front;  
530 - m_back = aeff.m_back;  
531 518
532 // Clone functors 519 // Clone functors
533 m_eff_func1 = (aeff.m_eff_func1 != NULL) ? aeff.m_eff_func1->clone() : NULL; 520 m_eff_func1 = (aeff.m_eff_func1 != NULL) ? aeff.m_eff_func1->clone() : NULL;
@@ -601,9 +588,11 @@ void GLATAeff::read_aeff(const GFitsTable&amp; hdu) @@ -601,9 +588,11 @@ void GLATAeff::read_aeff(const GFitsTable&amp; hdu)
601 } // endif: there were effective area bins 588 } // endif: there were effective area bins
602 589
603 // Set detector section using the DETNAM keyword in the HDU 590 // Set detector section using the DETNAM keyword in the HDU
  591 + /*
604 std::string detnam = gammalib::strip_whitespace(hdu.string("DETNAM")); 592 std::string detnam = gammalib::strip_whitespace(hdu.string("DETNAM"));
605 m_front = (detnam == "FRONT"); 593 m_front = (detnam == "FRONT");
606 m_back = (detnam == "BACK"); 594 m_back = (detnam == "BACK");
  595 + */
607 596
608 // Return 597 // Return
609 return; 598 return;