Changeset 3982 for trunk/MagicSoft/Mars/mcalib

Timestamp:

05/05/04 17:26:14 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (1 diff)
• MCalibrationRelTimeCalc.cc (modified) (2 diffs)
• MHCalibrationTestCam.cc (modified) (6 diffs)
• MHCalibrationTestPix.cc (modified) (1 diff)
• MHCalibrationTestTimeCam.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -228 +228 @@
 const Float_t MCalibrationChargeCalc::fgLambdaErrLimit         = 0.2;
 const Float_t MCalibrationChargeCalc::fgLambdaCheckLimit       = 0.2;
-const Float_t MCalibrationChargeCalc::fgPheErrLimit            = 4.;
+const Float_t MCalibrationChargeCalc::fgPheErrLimit            = 5.;
 const Float_t MCalibrationChargeCalc::fgFFactorErrLimit        = 3.;
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -72 +72 @@
 using namespace std;
 
-const Float_t MCalibrationRelTimeCalc::fgRelTimeRelErrLimit      = 7.5;
+const Float_t MCalibrationRelTimeCalc::fgRelTimeRelErrLimit      = 10.;
 // --------------------------------------------------------------------------
 //
@@ -343 +343 @@
       areasum2[aidx] /= (numareavalid[aidx]-1.);
       areasum [aidx] /= numareavalid[aidx];
-      lowlim  [aidx]  = areasum [aidx] - fRelTimeRelErrLimit*areasum2[aidx];
+      lowlim  [aidx]  = 0.;
       upplim  [aidx]  = areasum [aidx] + fRelTimeRelErrLimit*areasum2[aidx];
       

trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.cc

@@ -115 +115 @@
   fTitle = title ? title : "Histogram class for testing the calibration";
   
+  SetAverageNbins(5000);
 }
 
@@ -165 +166 @@
           (*fHiGainArray)[i] = new MHCalibrationTestPix("Calibrated Events",
                                                 "Test Calibration Pixel");
-          if (!(*fBadPixels)[i].IsOK())
-            (*this)[i].SetExcluded();
-
-          (*this)[i].InitBins();
-          (*this)[i].ChangeHistId(i);
-          (*this)[i].SetEventFrequency(fPulserFrequency);
+          InitHists((*this)[i],(*fBadPixels)[i],i);
       }
   }
@@ -181 +177 @@
           (*fLoGainArray)[i] = new MHCalibrationTestPix("Calibrated Events",
                                                 "Test Calibration Pixel");
-          if (!(*fBadPixels)[i].IsOK())
-            (*this)[i].SetExcluded();
-
-          (*this)[i].InitBins();
-          (*this)[i].ChangeHistId(i);
-          (*this)[i].SetEventFrequency(fPulserFrequency);
+          InitHists((*this)(i),(*fBadPixels)[i],i);
       }
   }
@@ -207 +198 @@
         GetAverageHiGainArea(j).SetEventFrequency(fPulserFrequency);
 
+        TH1F *h =  GetAverageHiGainArea(j).GetHGausHist();
+        h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
       }
   }
@@ -245 +238 @@
           GetAverageHiGainSector(j).ChangeHistId(j);
           GetAverageHiGainSector(j).SetEventFrequency(fPulserFrequency);
+
+          TH1F *h =  GetAverageHiGainSector(j).GetHGausHist();
+          h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
+
       }
   }
@@ -307 +304 @@
   memset(sumareahi,   0, nareas * sizeof(Float_t));
   memset(sumsectorhi, 0, nsectors*sizeof(Float_t));
+  memset(numareahi,   0, nareas * sizeof(Int_t));
+  memset(numsectorhi, 0, nsectors*sizeof(Int_t));
   
   for (Int_t i=0; i<npixels; i++)

trunk/MagicSoft/Mars/mcalib/MHCalibrationTestPix.cc

@@ -81 +81 @@
 
   fHGausHist.SetName("HCalibrationTest");
-  fHGausHist.SetTitle("Distribution of calibrated Summed FADC slices Pixel");  
-  fHGausHist.SetXTitle("Sum FADC Slices");
+  fHGausHist.SetTitle("Distribution of calibrated Photons Pixel");  
+  fHGausHist.SetXTitle("Nr. Photons");
   fHGausHist.SetYTitle("Nr. of events");
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationTestTimeCam.cc

@@ -113 +113 @@
   fName  = name  ? name  : "MHCalibrationTestTimeCam";
   fTitle = title ? title : "Histogram class for testing the calibration of arrival times";
-  
+
+  SetAverageNbins(5000);
 }
 
@@ -195 +196 @@
         GetAverageHiGainArea(j).SetEventFrequency(fPulserFrequency);
 
+        TH1F *h =  GetAverageHiGainArea(j).GetHGausHist();
+        h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
+
+
       }
   }
@@ -233 +238 @@
           GetAverageHiGainSector(j).ChangeHistId(j);
           GetAverageHiGainSector(j).SetEventFrequency(fPulserFrequency);
+          TH1F *h =  GetAverageHiGainSector(j).GetHGausHist();
+          h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
+
+
       }
   }
@@ -295 +304 @@
   memset(sumareahi,   0, nareas * sizeof(Float_t));
   memset(sumsectorhi, 0, nsectors*sizeof(Float_t));
+  memset(numareahi,   0, nareas * sizeof(Int_t));
+  memset(numsectorhi, 0, nsectors*sizeof(Int_t));
   
   for (Int_t i=0; i<npixels; i++)