Changeset 286 in Idarraga

Timestamp:

Apr 20, 2012, 5:36:54 PM (12 years ago)

Author:

idarraga

Message:

 

Location:

mafalda

Files:

• AnalysisCore/MediPixAnalysisCore.cpp (modified) (1 diff)
• AnalysisCore/MediPixAnalysisManager.h (modified) (2 diffs)
• MPXViewer/MPXViewer.cpp (modified) (5 diffs)
• MPXViewer/ViewerControl.cpp (modified) (6 diffs)
• MPXViewer/ViewerControl.h (modified) (5 diffs)

mafalda/AnalysisCore/MediPixAnalysisCore.cpp

@@ -199 +199 @@
                 m_scheduledForDisconnection.clear();
 
+                // Clean up stuff cleanable on an event per event basis
+                theManager->CleanUpCalibMap();
+
         }
 

mafalda/AnalysisCore/MediPixAnalysisManager.h

@@ -91 +91 @@
         };
 
-        inline Double_t GetMatrixElementMCEdep(Int_t col, Int_t row)
-        {
+        inline Double_t GetMatrixElementMCEdep(Int_t col, Int_t row) {
                 return analysisCore->m_frameXC_TruthE[row*analysisCore->fWidth + col];
-                //return analysisCore->m_frameMatrixMCEdep[col][row];
-        };
+        };
+
+        void SetCalibEnergy(Int_t xy, Double_t e) {
+                m_frameCalibEnergyMap[xy] = (Int_t)e;
+        };
+        Int_t GetCalibEnergy(Int_t xy) {
+                return m_frameCalibEnergyMap[xy];
+        };
+
+        void CleanUpCalibMap(){
+                m_frameCalibEnergyMap.clear();
+        }
 
         std::map<int,int> GetTOTMap()
@@ -218 +227 @@
 
         inline TApplication * GetApplication()
-                                                                {return analysisCore->g_theApp;};
+    {return analysisCore->g_theApp;};
+
+        void SetCalibEnergy(Int_t col, Int_t row, Double_t e);
+        Int_t GetCalibEnergy(Int_t col, Int_t row);
 
 private:
+
+        // Data after Calibration.  This is held here.  Does not belong to the Core as it
+        // doesn't come from data
+        std::map<int,int> m_frameCalibEnergyMap;
 
         MediPixAnalysisCore * analysisCore;

mafalda/MPXViewer/MPXViewer.cpp

@@ -53 +53 @@
         feedBackInfo_New->autoAdjust = true;
         feedBackInfo_New->m_plotTOT = true;
+        feedBackInfo_New->m_plotCalib = false;
         feedBackInfo_New->m_plotLvl1 = false;
         feedBackInfo_New->m_plotMC = false;
@@ -62 +63 @@
         feedBackInfo_Old->autoAdjust = true;
         feedBackInfo_Old->m_plotTOT = true;
+        feedBackInfo_Old->m_plotCalib = false;
         feedBackInfo_Old->m_plotLvl1 = false;
         feedBackInfo_Old->m_plotMC = false;
@@ -239 +241 @@
 
                 if ( feedBackInfo_New->m_plotTOT ) {
-                        l1->DrawLatex(xposT, yposT + 5, "TOT");
+                        l1->DrawLatex(xposT, yposT*1.05, "TOT");
+                } else if ( feedBackInfo_New->m_plotCalib ) {
+                        l1->DrawLatex(xposT, yposT*1.05, "Energy");
+                        l1->DrawLatex(xposT, yposT*1.01, "[keV]");
                 } else if ( feedBackInfo_New->m_plotLvl1 ) {
-                        l1->DrawLatex(xposT, yposT + 5, "LVL1");
+                        l1->DrawLatex(xposT, yposT*1.05, "LVL1");
                 } else if ( feedBackInfo_New->m_plotMC ){
-                        l1->DrawLatex(xposT, yposT + 5, "MC");
-                        l1->DrawLatex(xposT, yposT + 1, "[keV]");
+                        l1->DrawLatex(xposT, yposT*1.05, "MC");
+                        l1->DrawLatex(xposT, yposT*1.01, "[keV]");
                 } else if ( feedBackInfo_New->m_plotTruthMC ){
-                        l1->DrawLatex(xposT, yposT + 5, "TruthMC");
-                        l1->DrawLatex(xposT, yposT + 1, "[keV]");
+                        l1->DrawLatex(xposT, yposT*1.05, "TruthMC");
+                        l1->DrawLatex(xposT, yposT*1.01, "[keV]");
                 }
 
@@ -431 +436 @@
                 {
 
-                        if ( feedBackInfo_New->m_plotTOT ) {
+                        if ( feedBackInfo_New->m_plotTOT ) {  // plot TOT or counts
 
                                 histFrame->Fill(colItr, rowItr, GetMatrixElement(colItr, rowItr));
 
-
-                        } else if ( feedBackInfo_New->m_plotLvl1 ) {
+                        }  else if ( feedBackInfo_New->m_plotCalib ) {  // plot Energy through Calib
+
+                                // lvl1 case, lvl1 is put to -1 if there is no lvl1 info available
+                                if( GetCalibEnergy(colItr, rowItr) <= 0){
+                                        histFrame->Fill(colItr, rowItr, 0);
+                                }else{
+                                        histFrame->Fill(colItr, rowItr, GetCalibEnergy(colItr, rowItr));
+                                }
+
+                        } else if ( feedBackInfo_New->m_plotLvl1 ) {  // plot LVL1 info
 
                                 // lvl1 case, lvl1 is put to -1 if there is no lvl1 info available
@@ -445 +458 @@
                                 }
 
+                        } else if ( feedBackInfo_New->m_plotTruthMC ) { // plot MC info
+
+                                histFrame->Fill(colItr, rowItr, GetMatrixElementMCEdep(colItr, rowItr));
 
                         }
+
+
+
                 }
         }

mafalda/MPXViewer/ViewerControl.cpp

@@ -327 +327 @@
         contentsSwitchPlot->AddFrame(m_plotSwitchTOT, new TGLayoutHints(kLHintsTop | kLHintsLeft, 5, 5, 2, 2));
 
+        // Plot switch: Energy through calib
+        m_plotSwitchCalib = new TGRadioButton(contentsSwitchPlot, "Enegy(calib)");
+        m_plotSwitchCalib->SetOn(false, false); // tot by default
+        m_plotSwitchCalib->Connect("Toggled(Bool_t)", "MPXViewerControl", this, "TooglePlotValue_Calib()");
+        contentsSwitchPlot->AddFrame(m_plotSwitchCalib, new TGLayoutHints(kLHintsTop | kLHintsLeft, 5, 5, 2, 2));
+
         m_plotSwitchLvl1 = new TGRadioButton(contentsSwitchPlot, "lvl1");
         m_plotSwitchLvl1->SetOn(false, false);
@@ -563 +569 @@
 void MPXViewerControl::TooglePlotValue_TOT(){
         m_plotSwitchTOT->SetOn     (true, true);
+        m_plotSwitchCalib->SetOn   (false, false);
         m_plotSwitchLvl1->SetOn    (false, false);
         m_plotSwitchMC->SetOn      (false, false);
@@ -568 +575 @@
         feedBackInfoControl->SetPlotExclusive(__TOT);
 }
+void MPXViewerControl::TooglePlotValue_Calib(){
+        m_plotSwitchTOT->SetOn     (false, false);
+        m_plotSwitchCalib->SetOn     (true, true);
+        m_plotSwitchLvl1->SetOn    (false, false);
+        m_plotSwitchMC->SetOn      (false, false);
+        m_plotSwitchTruthMC->SetOn (false, false);
+        feedBackInfoControl->SetPlotExclusive(__Calib);
+}
+
 void MPXViewerControl::TooglePlotValue_lvl1(){
         m_plotSwitchTOT->SetOn     (false, false);
+        m_plotSwitchCalib->SetOn   (false, false);
         m_plotSwitchLvl1->SetOn    (true, true);
         m_plotSwitchMC->SetOn      (false, false);
@@ -577 +594 @@
 void MPXViewerControl::TooglePlotValue_MC(){
         m_plotSwitchTOT->SetOn     (false, false);
+        m_plotSwitchCalib->SetOn   (false, false);
         m_plotSwitchLvl1->SetOn    (false, false);
         m_plotSwitchMC->SetOn      (true, true);
@@ -584 +602 @@
 void MPXViewerControl::TooglePlotValue_TMC(){
         m_plotSwitchTOT->SetOn     (false, false);
+        m_plotSwitchCalib->SetOn   (false, false);
         m_plotSwitchLvl1->SetOn    (false, false);
         m_plotSwitchMC->SetOn      (false, false);
@@ -798 +817 @@
 void MPXViewerControl::DisconnectAndRun(){
 
+        // Optional save config
+        SaveConfiguration();
+
         // Through the feedBack MPXViewer will Schedule itself for disconnection
         feedBackInfoControl->m_disconnect = true;

mafalda/MPXViewer/ViewerControl.h

@@ -106 +106 @@
 typedef enum {
         __TOT = 0,
+        __Calib,
         __LVL1,
         __MC,
@@ -120 +121 @@
   Bool_t autoAdjust; 
   Bool_t m_plotTOT;
+  Bool_t m_plotCalib;
   Bool_t m_plotLvl1;
   Bool_t m_plotMC;
@@ -131 +133 @@
 
   void SetPlotExclusive(plotVar i){
-          if(i == __TOT)      { m_plotTOT = true;  m_plotLvl1 = false; m_plotMC = false; m_plotTruthMC = false; }
-          if(i == __LVL1)     { m_plotTOT = false; m_plotLvl1 = true;  m_plotMC = false; m_plotTruthMC = false; }
-          if(i == __MC)       { m_plotTOT = false; m_plotLvl1 = false; m_plotMC = true;  m_plotTruthMC = false; }
-          if(i == __TRUTH_MC) { m_plotTOT = false; m_plotLvl1 = false; m_plotMC = false; m_plotTruthMC = true; }
+          if(i == __TOT)      { m_plotTOT = true;  m_plotCalib = false; m_plotLvl1 = false; m_plotMC = false; m_plotTruthMC = false; }
+          if(i == __Calib)      { m_plotTOT = false;  m_plotCalib = true; m_plotLvl1 = false; m_plotMC = false; m_plotTruthMC = false; }
+          if(i == __LVL1)     { m_plotTOT = false; m_plotCalib = false; m_plotLvl1 = true;  m_plotMC = false; m_plotTruthMC = false; }
+          if(i == __MC)       { m_plotTOT = false; m_plotCalib = false; m_plotLvl1 = false; m_plotMC = true;  m_plotTruthMC = false; }
+          if(i == __TRUTH_MC) { m_plotTOT = false; m_plotCalib = false; m_plotLvl1 = false; m_plotMC = false; m_plotTruthMC = true; }
   };
 
@@ -224 +227 @@
    // Plot switches
    TGRadioButton * m_plotSwitchTOT;
+   TGRadioButton * m_plotSwitchCalib;
    TGRadioButton * m_plotSwitchLvl1;
    TGRadioButton * m_plotSwitchMC; // energy with digitizer effects
@@ -274 +278 @@
   void ToogleAutoAdjust();
   void TooglePlotValue_TOT();
+  void TooglePlotValue_Calib();
   void TooglePlotValue_lvl1();
   void TooglePlotValue_MC();