Revert "ADD: New report feature, fixed Ba-133 only calibration"

This reverts commit ab45652.

Author: zoglauer

resource/libraries/Calibration.isotopes

@@ -31,10 +31,10 @@ Ba  133    34.987  11.6     E
 Ba  133    35.818   3.58    E
 Ba  133    53.161   2.199   E
 # Ba  133    79.614   2.62    E  this mini line just screws things up in melinator -- we pretend we do not know it...
-Ba  133    80.997  34.06    P 
+Ba  133    80.997  34.06    D 
 Ba  133   276.398   7.164   
 Ba  133   302.853  18.33   
-Ba  133   356.017  62.05    S
+Ba  133   356.017  62.05    
 Ba  133   383.851   8.94
 
 # 137-Cs

src/fretalon/base/src/MCalibrateEnergyAssignEnergies.cxx

@@ -224,7 +224,6 @@ bool MCalibrateEnergyAssignEnergies::CalibrateLinear()
   if (g_Verbosity >= c_Info) cout<<endl<<"Assigning energies via linear method"<<endl;
 
   // Inventory:
-  unsigned int TotalNumberOfGoodPoints = 0;
   bool NoROGHasMoreThanOneGoodSpectralPoint = true;
   if (g_Verbosity >= c_Info) cout<<"Current line inventory: "<<endl;
   for (unsigned int r = 0; r < m_Results.GetNumberOfReadOutDataGroups(); ++r) {
@@ -235,7 +234,6 @@ bool MCalibrateEnergyAssignEnergies::CalibrateLinear()
       } else {
         if (g_Verbosity >= c_Info) cout<<"Included: "<<m_Results.GetSpectralPoint(r, p)<<endl;
         ++NumberOfGoodPoints;
-        ++TotalNumberOfGoodPoints;
       }
     }
     if (NumberOfGoodPoints > 1) {
@@ -267,47 +265,6 @@ bool MCalibrateEnergyAssignEnergies::CalibrateLinear()
     return true;
   }
 
-  // Special case: We have one ROG with one isotope (which has a primary and secondary line) with two spectral points - this handles Ba-133 only calibrations:
-  if (m_Results.GetNumberOfReadOutDataGroups() == 1 && m_Isotopes[0].size() == 1 && m_Isotopes[0][0].GetPrimaryLine() != -1 && m_Isotopes[0][0].GetSecondaryLine() != -1 && TotalNumberOfGoodPoints == 2) {
-
-    if (g_Verbosity >= c_Info) cout<<"Assign energies: Special case with 1 ROG, 1 isotope with 2 spectral point"<<endl;
-
-    unsigned int r = 0; // our single ROG
-    unsigned int i = 0; // our single Isotope
-    int PrimaryLineID = m_Isotopes[r][i].GetPrimaryLine();
-    int SecondaryLineID = m_Isotopes[r][i].GetSecondaryLine();
-
-    vector<unsigned int> GoodSpectralPointIDs;
-    for (unsigned int p = 0; p < m_Results.GetNumberOfSpectralPoints(r); ++p) {
-      if (m_Results.GetSpectralPoint(r, p).IsGood() == true) {
-        GoodSpectralPointIDs.push_back(p);
-      }
-    }
-
-    unsigned int plow = 0;
-    unsigned int phigh = 0;
-    if (m_Results.GetSpectralPoint(r, GoodSpectralPointIDs[0]).GetPeak() < m_Results.GetSpectralPoint(r, GoodSpectralPointIDs[1]).GetPeak()) {
-      plow = GoodSpectralPointIDs[0];
-      phigh = GoodSpectralPointIDs[1];
-    } else {
-      plow = GoodSpectralPointIDs[1];
-      phigh = GoodSpectralPointIDs[0];
-    }
-
-    if (m_Isotopes[r][0].GetLineEnergy(PrimaryLineID) < m_Isotopes[r][0].GetLineEnergy(SecondaryLineID)) {
-      m_Results.GetSpectralPoint(r, plow).SetIsotope(m_Isotopes[r][0]);
-      m_Results.GetSpectralPoint(r, plow).SetEnergy(m_Isotopes[r][0].GetLineEnergy(PrimaryLineID));
-      m_Results.GetSpectralPoint(r, phigh).SetIsotope(m_Isotopes[r][0]);
-      m_Results.GetSpectralPoint(r, phigh).SetEnergy(m_Isotopes[r][0].GetLineEnergy(SecondaryLineID));
-    } else {
-      m_Results.GetSpectralPoint(r, plow).SetIsotope(m_Isotopes[r][0]);
-      m_Results.GetSpectralPoint(r, plow).SetEnergy(m_Isotopes[r][0].GetLineEnergy(SecondaryLineID));
-      m_Results.GetSpectralPoint(r, phigh).SetIsotope(m_Isotopes[r][0]);
-      m_Results.GetSpectralPoint(r, phigh).SetEnergy(m_Isotopes[r][0].GetLineEnergy(PrimaryLineID));
-    }
-
-    return true;
-  }
 
 
   // Create a list of spectral points

src/fretalon/melinator/inc/MGUIMainMelinator.h

@@ -111,8 +111,6 @@ class MGUIMainMelinator : public TGMainFrame
   virtual bool OnLoad();
   //! Actions when the save as button has been pressed
   virtual bool OnSaveAs();
-  //! Actions when the show report as button has been pressed
-  virtual bool OnShowReport();
   //! Actions when the next button has been pressed
   virtual bool OnNext();
   //! Actions when the back button has been pressed
@@ -287,7 +285,6 @@ class MGUIMainMelinator : public TGMainFrame
   static const int c_CalibrationModelDeterminationMethodFittingFWHMModel    =  73;
   static const int c_Save                       =  80;
   static const int c_SaveAs                     =  81;
-  static const int c_ShowReport                 =  90;
   static const int c_Remove                     = 400;
   static const int c_Options                    = 500;
   static const int c_Change                     = 600;

src/fretalon/melinator/inc/MMelinator.h

@@ -160,13 +160,10 @@ class MMelinator
 
   //! Remove all collection which don't have positive data entries
   //void RemoveCollectionsWithNoPositiveEntries() { m_Store.RemoveCollectionsWithNoPositiveEntries(); }
-
+ 
   //! Save the calibration in e-cal format
   bool Save(MString FileName);
-
-  //! Create a calibration report
-  bool CreateReport();
-
+  
   //! Dump a string
   virtual MString ToString() const;  
 

src/fretalon/melinator/src/MGUIMainMelinator.cxx

@@ -169,6 +169,10 @@ void MGUIMainMelinator::Create()
   MenuFiles->AddEntry("Choose files and isotopes", c_ChooseCalibrationFiles);
   MenuFiles->AddEntry("Load files", c_LoadLast);
   MenuFiles->AddSeparator();
+  MenuFiles->AddLabel("Calibration result");
+  MenuFiles->AddEntry("Save As...", c_SaveAs);
+  MenuFiles->AddEntry("Save", c_Save);
+  MenuFiles->AddSeparator();
   MenuFiles->AddLabel("Configuration file");
   //MenuFiles->AddEntry("Open", c_LoadConfig);
   MenuFiles->AddEntry("Open -> use command line at launch", c_LoadConfig);
@@ -179,18 +183,7 @@ void MGUIMainMelinator::Create()
   MenuFiles->AddSeparator();
   MenuFiles->AddEntry("Exit", c_Exit);
   MenuFiles->Associate(this);
-  MenuBar->AddPopup("Input", MenuFiles, MenuBarItemLayoutLeft);
-
-  TGPopupMenu* MenuResults = new TGPopupMenu(gClient->GetRoot());
-  MenuResults->AddLabel("Calibration file");
-  MenuResults->AddEntry("Save As...", c_SaveAs);
-  MenuResults->AddEntry("Save", c_Save);
-  MenuResults->AddSeparator();
-  MenuResults->AddLabel("Calibration report");
-  MenuResults->AddEntry("Create and Show", c_ShowReport);
-  //MenuResults->AddSeparator();
-  MenuResults->Associate(this);
-  MenuBar->AddPopup("Output", MenuResults, MenuBarItemLayoutLeft);
+  MenuBar->AddPopup("Files", MenuFiles, MenuBarItemLayoutLeft);
 
   TGPopupMenu* MenuInfo = new TGPopupMenu(fClient->GetRoot());
   MenuInfo->AddEntry("About", c_About);
@@ -939,10 +932,6 @@ bool MGUIMainMelinator::ProcessMessage(long Message, long Parameter1, long Param
         Status = OnSaveAs();
         break;
 
-      case c_ShowReport:
-        Status = OnShowReport();
-        break;
-
       case c_About:
         Status = OnAbout();
         break;
@@ -1453,22 +1442,6 @@ bool MGUIMainMelinator::OnSaveAs()
 ////////////////////////////////////////////////////////////////////////////////
 
 
-//! Actions when the show report button has been pressed
-bool MGUIMainMelinator::OnShowReport()
-{
-  bool Return = m_Melinator.CreateReport();
-
-  if (Return == false) {
-    mgui<<"Unable to create calibration report"<<error;
-  }
-
-  return Return;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-
 bool MGUIMainMelinator::OnLoad()
 {  
   return false;