Changeset 4940 for trunk/MagicSoft

Timestamp:

09/10/04 21:01:08 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• HCalibLinkDef.h (modified) (1 diff)
• MHCalibrationTestTimeCam.cc (modified) (5 diffs)
• MHCalibrationTestTimeCam.h (modified) (2 diffs)
• MHCalibrationTestTimePix.cc (deleted)
• MHCalibrationTestTimePix.h (deleted)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mhcalib/HCalibLinkDef.h

@@ -15 +15 @@
 #pragma link C++ class MHCalibrationTestCam+;
 #pragma link C++ class MHCalibrationTestTimeCam+;
-#pragma link C++ class MHCalibrationTestTimePix+;
 
 #pragma link C++ class MHGausEvents++;

trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc

@@ -106 +106 @@
 
 using namespace std;
+
+const Int_t   MHCalibrationTestTimeCam::fgTestNbins     = 600;
+const Axis_t  MHCalibrationTestTimeCam::fgTestFirst     = -0.5;
+const Axis_t  MHCalibrationTestTimeCam::fgTestLast      = 29.5;
 // --------------------------------------------------------------------------
 //
 // Default Constructor. 
+//
+// Sets: 
+// - fTestNbins to fgTestNbins
+// - fTestFirst to fgTestFirst
+// - fTestLast  to fgTestLast 
 //
 MHCalibrationTestTimeCam::MHCalibrationTestTimeCam(const char *name, const char *title) 
@@ -116 +125 @@
   fTitle = title ? title : "Histogram class for testing the calibration of arrival times";
 
-  SetAverageNbins(5000);
+  SetTestNbins();
+  SetTestFirst();
+  SetTestLast ();
+
 }
 
@@ -164 +176 @@
       for (Int_t i=0; i<npixels; i++)
       {
-          (*fHiGainArray)[i] = new MHCalibrationTestTimePix("Calibrated Events Time",
+          (*fHiGainArray)[i] = new MHCalibrationPix("TestTimePix",
                                                 "TestTime Calibration Pixel");
+          MHCalibrationPix &pix = (*this)[i];          
+
+          pix.SetNbins(fTestNbins);
+          pix.SetFirst(fTestFirst);
+          pix.SetLast (fTestLast);
+
+          TH1F *h =  pix.GetHGausHist();
+        
+          h->SetName ("HTestHiGainPix");
+          h->SetTitle("Calibrated Rel. Arrival Times Pixel ");  
+          h->SetXTitle("Arrival Time [FADC slices]");
+          h->SetYTitle("Nr. of events");
+
           InitHists((*this)[i],(*fBadPixels)[i],i);
       }
@@ -177 +202 @@
       {
         (*fAverageHiGainAreas)[j] = 
-          new MHCalibrationTestTimePix("MHCalibrationTestTimeAverageArea",
+          new MHCalibrationPix("TestTimeArea",
                            "Average TestTime Calibrations Area Idx ");
 
-        GetAverageHiGainArea(j).GetHGausHist()->SetTitle("TestTime Calibrations Area Idx ");
-        GetAverageHiGainArea(j).SetNbins(fAverageNbins);
-        GetAverageHiGainArea(j).InitBins();
-        GetAverageHiGainArea(j).ChangeHistId(j);
-        GetAverageHiGainArea(j).SetEventFrequency(fPulserFrequency);
-
-        TH1F *h =  GetAverageHiGainArea(j).GetHGausHist();
+        MHCalibrationPix &pix = GetAverageHiGainArea(j);
+
+        pix.SetNbins(fTestNbins*3);
+        pix.SetFirst(fTestFirst);
+        pix.SetLast (fTestLast);
+        
+        TH1F *h =  pix.GetHGausHist();
+
+        h->SetName ("HTestTimeArea");
+        h->SetTitle("Calibrated Rel. Arrival Times Area Idx ");
+        h->SetXTitle("Arrival Time [FADC slices]");
+        h->SetYTitle("Nr. of events");
+
+        pix.InitBins();
+        pix.ChangeHistId(j);
+        pix.SetEventFrequency(fPulserFrequency);
+
         h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
-
-
       }
   }
@@ -201 +234 @@
       {
           (*fAverageHiGainSectors)[j] = 
-            new MHCalibrationTestTimePix("MHCalibrationTestTimeAverageSector",
+            new MHCalibrationPix("TestTimeSector",
                              "Average TestTime Calibrations Sector ");
 
-          GetAverageHiGainSector(j).GetHGausHist()->SetTitle("TestTime Calibrations Sector ");
-          GetAverageHiGainSector(j).SetNbins(fAverageNbins);
-          GetAverageHiGainSector(j).InitBins();
-          GetAverageHiGainSector(j).ChangeHistId(j);
-          GetAverageHiGainSector(j).SetEventFrequency(fPulserFrequency);
-          TH1F *h =  GetAverageHiGainSector(j).GetHGausHist();
-          h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
-
-
+        MHCalibrationPix &pix = GetAverageHiGainSector(j);
+
+        pix.SetNbins(fTestNbins*3);
+        pix.SetFirst(fTestFirst);
+        pix.SetLast (fTestLast);
+        
+        TH1F *h =  pix.GetHGausHist();
+
+        h->SetName ("HTestTimeSector");
+        h->SetTitle("Calibrated Rel. Arr. Times Sector ");
+        h->SetXTitle("Arrival Time [FADC slices]");
+        h->SetYTitle("Nr. of events");
+
+        pix.InitBins();
+        pix.ChangeHistId(j);
+        pix.SetEventFrequency(fPulserFrequency);
+
+        h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
       }
   }

trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.h

@@ -11 +11 @@
 private:
 
+  static const Int_t   fgTestNbins;        // Default for fTestNBins  (now set to: 600  )
+  static const Axis_t  fgTestFirst;        // Default for fTestFirst  (now set to: -0.5  )
+  static const Axis_t  fgTestLast;         // Default for fTestLast   (now set to: 29.5)
+
+  Int_t   fTestNbins;            // Number of bins        
+  Axis_t  fTestFirst;            // Lower histogram limit 
+  Axis_t  fTestLast;             // Upper histogram limit 
+  
   Bool_t ReInitHists(MParList *pList);
   Bool_t FillHists(const MParContainer *par, const Stat_t w=1);
@@ -26 +34 @@
   void CalcAverageSigma();
   
+  void  SetTestNbins  ( const Int_t  i=fgTestNbins  ) { fTestNbins   = i; }
+  void  SetTestFirst  ( const Axis_t f=fgTestFirst  ) { fTestFirst   = f; }
+  void  SetTestLast   ( const Axis_t f=fgTestLast   ) { fTestLast    = f; }  
+
   ClassDef(MHCalibrationTestTimeCam, 0) // Histogram class for Relative Time Camera Calibration
 };

trunk/MagicSoft/Mars/mhcalib/Makefile

@@ -42 +42 @@
            MHCalibrationTestCam.cc \
            MHCalibrationTestTimeCam.cc \
-           MHCalibrationTestTimePix.cc \
            MHGausEvents.cc