Changeset 3952 for trunk/MagicSoft/Mars/mcalib

Timestamp:

05/03/04 19:03:03 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationRelTimeCalc.cc (modified) (3 diffs)
• MHCalibrationChargeBlindPix.cc (modified) (5 diffs)
• MHCalibrationChargeBlindPix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -72 +72 @@
 using namespace std;
 
-const Float_t MCalibrationRelTimeCalc::fgRelTimeRelErrLimit      = 25.;
+const Float_t MCalibrationRelTimeCalc::fgRelTimeRelErrLimit      = 7.5;
 // --------------------------------------------------------------------------
 //
@@ -292 +292 @@
         continue;
 
-      if (bad.IsUnsuitable(MBadPixelsPix::kUnreliableRun))
-        continue;
-      
       const Float_t res   = pix.GetTimePrecision();
       const Int_t   aidx  = (*fGeom)[i].GetAidx();
@@ -306 +303 @@
   for (UInt_t aidx=0; aidx<nareas; aidx++)
     {
-      if (numareavalid[aidx] == 0)
-        {
-          *fLog << warn << GetDescriptor() << ": No pixels with valid time resolution found "
+      if (numareavalid[aidx] < 20)
+        {
+          *fLog << warn << GetDescriptor() << ": Less than 20 pixels with valid time resolution found "
                 << "in area index: " << aidx << endl;
           continue;

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc

@@ -120 +120 @@
 // Initializes:
 // - all pointers to NULL
+// - fASinglePheFADCSlices(0);
+// - fAPedestalFADCSlices(0);
+//
 //
 // Calls:
@@ -148 +151 @@
     fHGausHist.SetYTitle("Nr. of events");
 
+    fASinglePheFADCSlices(0);
+    fAPedestalFADCSlices(0);
+  
     Clear();
 }
@@ -294 +300 @@
 // - MExtractedSignalBlindPixel
 // 
-// Initializes:
-// - fASinglePheFADCSlices(0);
-// - fAPedestalFADCSlices(0);
-//
 // Calls:
 // - MHGausHist::InitBins()
@@ -317 +319 @@
       return kFALSE;
     }
-  
-  fASinglePheFADCSlices(0);
-  fAPedestalFADCSlices(0);
   
   InitBins();
@@ -985 +984 @@
 
   pad->cd(3);
-  if (fHSinglePheFADCSlices)
-      delete fHSinglePheFADCSlices;
-
-  fHSinglePheFADCSlices = new TH1F(fASinglePheFADCSlices);
-  fHSinglePheFADCSlices->SetName("SinglePheFADCSlices");
-  fHSinglePheFADCSlices->SetTitle(Form("%s%f","Assumed Single Phe FADC Slices, Sum > ",fSinglePheCut));
-  fHSinglePheFADCSlices->SetXTitle("FADC slice number");
-  fHSinglePheFADCSlices->SetYTitle("FADC counts");
-  fHSinglePheFADCSlices->Draw(opt);
-
+
+  if (fASinglePheFADCSlices.GetNrows() != 0)
+    {
+      if (fHSinglePheFADCSlices)
+        delete fHSinglePheFADCSlices;
+      fHSinglePheFADCSlices = new TH1F(fASinglePheFADCSlices);
+      fHSinglePheFADCSlices->SetName("SinglePheFADCSlices");
+      fHSinglePheFADCSlices->SetTitle(Form("%s%f","Assumed Single Phe FADC Slices, Sum > ",fSinglePheCut));
+      fHSinglePheFADCSlices->SetXTitle("FADC slice number");
+      fHSinglePheFADCSlices->SetYTitle("FADC counts");
+      fHSinglePheFADCSlices->Draw(opt);
+    }
+  
   pad->cd(4);
-  if (fHPedestalFADCSlices)
-      delete fHPedestalFADCSlices;
-
-  fHPedestalFADCSlices = new TH1F(fAPedestalFADCSlices);
-  fHPedestalFADCSlices->SetName("PedestalFADCSlices");
-  fHPedestalFADCSlices->SetTitle(Form("%s%f","Pedestal FADC Slices, Sum < ",fSinglePheCut));
-  fHPedestalFADCSlices->SetXTitle("FADC slice number");
-  fHPedestalFADCSlices->SetYTitle("FADC counts");
-  fHPedestalFADCSlices->Draw(opt);
-
+  if (fAPedestalFADCSlices.GetNrows() != 0)
+    {
+
+      if (fHPedestalFADCSlices)
+        delete fHPedestalFADCSlices;
+      
+      fHPedestalFADCSlices = new TH1F(fAPedestalFADCSlices);
+      fHPedestalFADCSlices->SetName("PedestalFADCSlices");
+      fHPedestalFADCSlices->SetTitle(Form("%s%f","Pedestal FADC Slices, Sum < ",fSinglePheCut));
+      fHPedestalFADCSlices->SetXTitle("FADC slice number");
+      fHPedestalFADCSlices->SetYTitle("FADC counts");
+      fHPedestalFADCSlices->Draw(opt);
+    }
+  
   if (win < 2)
   return;

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.h

@@ -46 +46 @@
   TVector fAPedestalFADCSlices;              // Averaged FADC slice entries supposed pedestal   events
  
-  TF1 *fSinglePheFit;                        //-> Single Phe Fit (Gaussians convoluted with Poisson) 
+  TF1 *fSinglePheFit;                        // Single Phe Fit (Gaussians convoluted with Poisson) 
 
   UInt_t  fNumSinglePhes;                    // Number of entries in fASinglePheFADCSlices