Changeset 4914 for trunk/MagicSoft

Timestamp:

09/09/04 20:20:08 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/CalibLinkDef.h (modified) (1 diff)
• mcalib/MHCalibrationChargeCam.cc (modified) (15 diffs)
• mcalib/MHCalibrationChargeCam.h (modified) (1 diff)
• mcalib/MHCalibrationChargeHiGainPix.cc (deleted)
• mcalib/MHCalibrationChargeHiGainPix.h (deleted)
• mcalib/MHCalibrationChargeLoGainPix.cc (deleted)
• mcalib/MHCalibrationChargeLoGainPix.h (deleted)
• mcalib/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
  2004/09/09: Markus Gaug
  
+   * mcalib/MHCalibrationChargeCam.[h,cc]
+     - initialize bins directly here. Remove MHCalibraitonChargeHiGainPix
+       and MHCalibrationChargeLoGainPix classes
+
+   * mcalib/MHCalibrationChargeHiGainPix.[h,cc]
+   * mcalib/MHCalibrationChargeLoGainPix.[h,cc]
+   * mcalib/Makefile
+   * mcalib/CalibLinkDef.h
+     - removed first two classes
+
    * mcalib/MCalibrationCam.[h,cc]
      - make default for GetNumUnsuitable and GetNumUnreliable

trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

@@ -41 +41 @@
 #pragma link C++ class MHCalibrationChargeCam+;
 #pragma link C++ class MHCalibrationChargePix+;
-#pragma link C++ class MHCalibrationChargeHiGainPix+;
-#pragma link C++ class MHCalibrationChargeLoGainPix+;
 #pragma link C++ class MHCalibrationChargeBlindCam+;
 #pragma link C++ class MHCalibrationChargeBlindPix+;

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -117 +117 @@
 #include "MParList.h"
 
-#include "MHCalibrationChargeHiGainPix.h"
-#include "MHCalibrationChargeLoGainPix.h"
 #include "MHCalibrationChargePix.h"
 #include "MHCalibrationPix.h"
@@ -156 +154 @@
 using namespace std;
 
-const Int_t   MHCalibrationChargeCam::fgAverageNbinsHiGain       = 3300;
-const Int_t   MHCalibrationChargeCam::fgAverageNbinsLoGain       = 1950;
+const Axis_t  MHCalibrationChargeCam::fgChargeHiGainFirst = -100.5;
+const Axis_t  MHCalibrationChargeCam::fgChargeHiGainLast  = 999.5;
+const Axis_t  MHCalibrationChargeCam::fgChargeLoGainFirst = -150.5;
+const Axis_t  MHCalibrationChargeCam::fgChargeLoGainLast  = 499.5;
+
 const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.01;
 const Float_t MHCalibrationChargeCam::fgNumLoGainSaturationLimit = 0.005;
@@ -179 +180 @@
 // - fTimeLowerLimit           to fgTimeLowerLimit 
 // - fTimeUpperLimit           to fgTimeUpperLimit 
-// - fAverageNbins             to fgAverageNbinsHiGain
 //
 MHCalibrationChargeCam::MHCalibrationChargeCam(const char *name, const char *title)
@@ -193 +193 @@
   SetTimeUpperLimit();
 
-  SetAverageNbins(fgAverageNbinsHiGain);
 }
 
@@ -242 +241 @@
 // - MHCalibrationCam::fAverageHiGainAreas
 // - MHCalibrationCam::fAverageHiGainSectors
-// 
-// Sets number of bins to MHCalibrationCam::fAverageNbins for:
-// - MHCalibrationCam::fAverageHiGainAreas, MHCalibrationCam::fAverageLoGainAreas
-// - MHCalibrationCam::fAverageHiGainSectors, MHCalibrationCam::fAverageLoGainSectors
 // 
 Bool_t MHCalibrationChargeCam::ReInitHists(MParList *pList)
@@ -321 +316 @@
       for (Int_t i=0; i<npixels; i++)
       {
-        (*fHiGainArray)[i] = new MHCalibrationChargeHiGainPix("ChargeHiGainPix");
+        (*fHiGainArray)[i] = new MHCalibrationChargePix("ChargeHiGainPix","Signals of the HiGain");
         MHCalibrationChargePix &pix = (MHCalibrationChargePix&)(*this)[i];
+
         pix.SetAbsTimeNbins(higainsamples);
+        pix.SetAbsTimeFirst(-0.5);
         pix.SetAbsTimeLast(higainsamples-0.5);
+
+        pix.SetNbins((Int_t)(fgChargeHiGainLast-fgChargeHiGainFirst));
+        pix.SetFirst(fgChargeHiGainFirst);
+        pix.SetLast(fgChargeHiGainLast);
+
+        pix.GetHGausHist()->SetName ("HCalibrationChargeHiGainPix");
+        pix.GetHGausHist()->SetTitle("Summed Hi Gain FADC slices Pixel ");  
+        
+        pix.GetHAbsTime()->SetName ("HAbsTimeHiGainPix");
+        pix.GetHAbsTime()->SetTitle("Absolute Arrival Times Hi Gain Pixel ");  
+
         InitHists((*this)[i],(*fBadPixels)[i],i);
       }
@@ -335 +343 @@
       for (Int_t i=0; i<npixels; i++)
         {
-          (*fLoGainArray)[i] = new MHCalibrationChargeLoGainPix("ChargeLoGainPix");
-          MHCalibrationPix &lopix = (*this)(i);
+          (*fLoGainArray)[i] = new MHCalibrationChargePix("ChargeLoGainPix","Signals of the LoGain");
+          MHCalibrationChargePix &pix = (MHCalibrationChargePix&)(*this)(i);
+
+          pix.SetAbsTimeNbins(logainsamples);
+          pix.SetAbsTimeFirst(-0.5);
+          pix.SetAbsTimeLast(logainsamples-0.5);
+          
+          pix.SetNbins((Int_t)(fgChargeLoGainLast-fgChargeLoGainFirst));
+          pix.SetFirst(fgChargeLoGainFirst);
+          pix.SetLast(fgChargeLoGainLast);
+          
+          pix.GetHGausHist()->SetName ("HCalibrationChargeLoGainPix");
+          pix.GetHGausHist()->SetTitle("Summed Lo Gain FADC slices Pixel ");  
+        
+          pix.GetHAbsTime()->SetName ("HAbsTimeLoGainPix");
+          pix.GetHAbsTime()->SetTitle("Absolute Arrival Times Lo Gain Pixel ");  
+
           //
           // Adapt the range for the case, the intense blue is used:
@@ -346 +369 @@
               if ( fColor == MCalibrationCam::kBLUE)
                 {
-                  lopix.SetLast(999.5);
-                  lopix.SetNbins(1150);
+                  pix.SetLast(999.5);
+                  pix.SetNbins((Int_t)(999.5-fgChargeLoGainFirst));
                 }
             }
-          ((MHCalibrationChargePix&)(*this)(i)).SetAbsTimeNbins(logainsamples);
-          ((MHCalibrationChargePix&)(*this)(i)).SetAbsTimeLast(logainsamples-0.5);
-          InitHists(lopix,(*fBadPixels)[i],i);
+          InitHists(pix,(*fBadPixels)[i],i);
       }
   }
@@ -362 +383 @@
     for (Int_t j=0; j<nareas; j++)
       {
-        (*fAverageHiGainAreas)[j] = 
-          new MHCalibrationChargeHiGainPix("ChargeAverageHiGainArea",
-                                           "Average HiGain FADC sums area idx ");
-
-        MHCalibrationChargePix &hist = (MHCalibrationChargePix&)GetAverageHiGainArea(j);
-
-        hist.SetNbins(fAverageNbins);
-        hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average HiGain Area Idx ");
+        (*fAverageHiGainAreas)[j] = new MHCalibrationChargePix("ChargeAverageHiGainArea",
+                                                               "Average HiGain FADC sums area idx ");
+
+        MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageHiGainArea(j);
+
+        pix.SetAbsTimeNbins(higainsamples);
+        pix.SetAbsTimeFirst(-0.5);
+        pix.SetAbsTimeLast(higainsamples-0.5);
+
+        pix.SetNbins((Int_t)(fgChargeHiGainLast-fgChargeHiGainFirst)*3);
+        pix.SetFirst(fgChargeHiGainFirst);
+        pix.SetLast(fgChargeHiGainLast);
+
+        pix.GetHGausHist()->SetName ("HCalibrationChargeHiGainAreaIdx");
+        pix.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis High Gain Area Idx ");
+        
+        pix.GetHAbsTime()->SetName ("HAbsTimeHiGainAreaIdx");
+        pix.GetHAbsTime()->SetTitle("Absolute Arrival Times average Hi Gain Area Idx ");  
 
         if (fGeom->InheritsFrom("MGeomCamMagic"))
           {
-            hist.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ",
+            pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ",
                                                j==0 ? "Inner Pixels " : "Outer Pixels ","High Gain Runs: "));
-            hist.InitBins();
-            hist.SetEventFrequency(fPulserFrequency);
+            pix.InitBins();
+            pix.SetEventFrequency(fPulserFrequency);
           }
         else
           {
-            hist.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis High Gain Area Idx ");
-            InitHists(hist,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+            InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
           }
       }
@@ -393 +423 @@
       for (Int_t j=0; j<nareas; j++)
         {
-          (*fAverageLoGainAreas)[j] = 
-            new MHCalibrationChargeLoGainPix("ChargeAverageLoGainArea",
-                                             "Average LoGain FADC sums of pixel area idx ");
-
-        MHCalibrationChargePix &hist = (MHCalibrationChargePix&)GetAverageLoGainArea(j);
-        hist.SetNbins(fgAverageNbinsLoGain);
+          (*fAverageLoGainAreas)[j] = new MHCalibrationChargePix("ChargeAverageLoGainArea",
+                                                                 "Average LoGain FADC sums area idx ");
+
+        MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageLoGainArea(j);
+
+        pix.SetAbsTimeNbins(logainsamples);
+        pix.SetAbsTimeFirst(-0.5);
+        pix.SetAbsTimeLast(logainsamples-0.5);
+
+        pix.SetNbins((Int_t)(fgChargeLoGainLast-fgChargeLoGainFirst)*3);
+        pix.SetFirst(fgChargeLoGainFirst);
+        pix.SetLast(fgChargeLoGainLast);
+
+        pix.GetHGausHist()->SetName ("HChargeLoGainAreaIdx");
+        pix.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis Low Gain Area Idx ");
+        
+        pix.GetHAbsTime()->SetName ("HAbsTimeLoGainAreaIdx");
+        pix.GetHAbsTime()->SetTitle("Absolute Arrival Times average Lo Gain Area Idx ");  
 
         //
@@ -409 +451 @@
               if ( fColor == MCalibrationCam::kBLUE)
                 {
-                  hist.SetFirst(-10.5);
-                  hist.SetLast(999.5);
-                  hist.SetNbins(3030);
+                  pix.SetFirst(-10.5);
+                  pix.SetLast(999.5);
+                  pix.SetNbins(3030);
                 }
             }
 
-        hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Area Idx ");
-
         if (fGeom->InheritsFrom("MGeomCamMagic"))
           {
-            hist.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ",
+            pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ",
                                                j==0 ? "Inner Pixels " : "Outer Pixels ","Low Gain Runs: "));
-            hist.InitBins();
-            hist.SetEventFrequency(fPulserFrequency);
+            pix.InitBins();
+            pix.SetEventFrequency(fPulserFrequency);
           }
         else
           {
-            hist.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis Low Gain Area Idx ");
-            InitHists(hist,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+            InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
           }
         }
@@ -438 +477 @@
       for (Int_t j=0; j<nsectors; j++)
       {
-          (*fAverageHiGainSectors)[j] = 
-            new MHCalibrationChargeHiGainPix("ChargeAverageHiGainSector",
-                                             "Averaged HiGain Signals Sector ");
-
-          MHCalibrationChargePix &hist = (MHCalibrationChargePix&)GetAverageHiGainSector(j);
-
-          hist.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis HiGain Sector ");
-          hist.SetNbins(fAverageNbins);
-          hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average HiGain Sector ");
-
-          InitHists(hist,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+          (*fAverageHiGainSectors)[j] = new MHCalibrationChargePix("ChargeAverageHiGainSector",
+                                                                   "Averaged HiGain Signals Sector ");
+
+          MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageHiGainSector(j);
+
+          pix.SetAbsTimeNbins(higainsamples);
+          pix.SetAbsTimeFirst(-0.5);
+          pix.SetAbsTimeLast(higainsamples-0.5);
+          
+          pix.SetNbins((Int_t)(fgChargeHiGainLast-fgChargeHiGainFirst)*3);
+          pix.SetFirst(fgChargeHiGainFirst);
+          pix.SetLast(fgChargeHiGainLast);
+
+          pix.GetHGausHist()->SetName ("HCalibrationChargeHiGainPix");
+          pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis HiGain Sector ");  
+        
+          pix.GetHAbsTime()->SetName ("HAbsTimeHiGainPix");
+          pix.GetHAbsTime()->SetTitle("Absolute Arrival Time average HiGain Sector ");  
+
+          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
       }
   }
@@ -458 +506 @@
       for (Int_t j=0; j<nsectors; j++)
       {
-          (*fAverageLoGainSectors)[j] = 
-            new MHCalibrationChargeLoGainPix("ChargeAverageLoGainSector",
-                                             "Average LoGain Signals Sector ");
-
-          MHCalibrationChargePix &hist = (MHCalibrationChargePix&)GetAverageLoGainSector(j);
-
-          hist.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis LoGain Sector ");
-          hist.SetNbins(fgAverageNbinsLoGain);
+          (*fAverageLoGainSectors)[j] = new MHCalibrationChargePix("ChargeAverageLoGainSector",
+                                                                   "Average LoGain Signals Sector ");
+
+          MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageLoGainSector(j);
+
+          pix.SetAbsTimeNbins(logainsamples);
+          pix.SetAbsTimeFirst(-0.5);
+          pix.SetAbsTimeLast(logainsamples-0.5);
           
+          pix.SetNbins((Int_t)(fgChargeLoGainLast-fgChargeLoGainFirst)*3);
+          pix.SetFirst(fgChargeLoGainFirst);
+          pix.SetLast(fgChargeLoGainLast);
+
+          pix.GetHGausHist()->SetName ("HCalibrationChargeLoGainPix");
+          pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis LoGain Sector ");  
+        
+          pix.GetHAbsTime()->SetName ("HAbsTimeLoGainPix");
+          pix.GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Sector ");  
+
           //
           // Adapt the range for the case, the intense blue is used:
@@ -476 +534 @@
               if ( fColor == MCalibrationCam::kBLUE)
                 {
-                  hist.SetFirst(-10.5);
-                  hist.SetLast(999.5);
-                  hist.SetNbins(3030);
+                  pix.SetFirst(-10.5);
+                  pix.SetLast(999.5);
+                  pix.SetNbins(3030);
                 }
             }
           
-          hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Sector ");
-
-          InitHists(hist,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
       }
   }
@@ -1108 +1164 @@
   cam->fColor                  = fColor;
   cam->fPulserFrequency        = fPulserFrequency;
-  cam->fAverageNbins           = fAverageNbins;
 
   return cam;

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h

@@ -24 +24 @@
 private:
 
-  static const Int_t   fgAverageNbinsHiGain;         //! The default for fAverageNbins HiGain (now set to: 3300)
-  static const Int_t   fgAverageNbinsLoGain;         //! The default for fAverageNbins LoGain (now set to: 1950)  
-
+  static const Axis_t  fgChargeHiGainFirst;          //! First Bin of HiGain Histograms (nw set to: -100.5)
+  static const Axis_t  fgChargeHiGainLast;           //! Last Bin of HiGain Histograms (nw set to:   999.5)
+  static const Axis_t  fgChargeLoGainFirst;          //! First Bin of LoGain Histograms (nw set to: -150.5)
+  static const Axis_t  fgChargeLoGainLast;           //! Last Bin of LoGain Histograms (nw set to:   499.5)
+  
   static const Float_t fgNumHiGainSaturationLimit;   //! The default for fNumHiGainSaturationLimit (now at: 0.01)
   static const Float_t fgNumLoGainSaturationLimit;   //! The default for fNumLoGainSaturationLimit (now at: 0.005)

trunk/MagicSoft/Mars/mcalib/Makefile

@@ -66 +66 @@
            MHCalibrationPix.cc \
            MHCalibrationChargeCam.cc \
-           MHCalibrationChargeHiGainPix.cc \
-           MHCalibrationChargeLoGainPix.cc \
            MHCalibrationChargePINDiode.cc \
            MHCalibrationRelTimeCam.cc \