Changeset 4390 for trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

Timestamp:

07/15/04 13:57:55 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (modified) (12 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -236 +236 @@
 // Default constructor. 
 //
-// Sets all pointers to NULL
+// Sets the pointer to fQECam and fGeom to NULL
 // 
 // Calls AddToBranchList for: 
@@ -255 +255 @@
 // - fOutputPath        to "."
 // - fOutputFile        to "ChargeCalibStat.txt"
-// 
+// - flag debug         to kFALSE
+//
 // Calls:
 // - Clear()
 //
 MCalibrationChargeCalc::MCalibrationChargeCalc(const char *name, const char *title)
-    : fBadPixels(NULL), fCam(NULL), fBlindPixel(NULL), fPINDiode(NULL), 
-      fQECam(NULL), fGeom(NULL), fPedestals(NULL), fEvtTime(NULL)
+    : fQECam(NULL), fGeom(NULL)
 {
         
@@ -279 +279 @@
   SetLambdaErrLimit    ();
   SetPheErrLimit       ();
-  SetPulserColor       ( MCalibrationCam::kNONE );
   SetOutputPath        ();
   SetOutputFile        ();
-  SetDebug             ( kFALSE );
+  SetDebug       ( kFALSE );
 
   Clear();
@@ -293 +292 @@
 // - all variables to 0., 
 // - all flags to kFALSE
+// - all pointers to NULL
+// - the pulser colour to kNONE
+// - fBlindPixelFlags to 0
+// - fPINDiodeFlags   to 0
 //
 void MCalibrationChargeCalc::Clear(const Option_t *o)
@@ -302 +305 @@
     fSqrtLoGainSamples         = 0.;
     fNumInnerFFactorMethodUsed = 0;
-    SkipHiLoGainCalibration( kFALSE );    
+
+    fBadPixels  = NULL;
+    fCam        = NULL;
+    fBlindPixel = NULL;
+    fPINDiode   = NULL;
+    fPedestals  = NULL;
+
+    SetPulserColor ( MCalibrationCam::kNONE );
+    
+    fBlindPixelFlags.Set(0);
+    fPINDiodeFlags  .Set(0);
+    fResultFlags    .Set(0);
 }
 
@@ -316 +330 @@
 //  - MBadPixelsCam
 //
-// The following output containers are only searched,  but not created. If they 
-// cannot be found, the corresponding calibration part is only skipped.
-//
-//  - MTime
-//
 Int_t MCalibrationChargeCalc::PreProcess(MParList *pList)
 {
@@ -352 +361 @@
 
   
-  fEvtTime = (MTime*)pList->FindObject("MTime");
-
   //
   // Check the pulser colour --> FIXME: this solution is only valid until the arrival of the DM's
@@ -953 +960 @@
       
       const Float_t nphe  = pix.GetPheFFactorMethod();
-      const Float_t nvar  = pix.GetPheFFactorMethod()*pix.GetPheFFactorMethod();
       const Int_t   aidx  = (*fGeom)[i].GetAidx();
 
@@ -960 +966 @@
 
       areaphes    [aidx] += nphe;
-      areavars    [aidx] += nvar;
+      areavars    [aidx] += nphe*nphe;
       numareavalid[aidx] ++;
     } 
@@ -973 +979 @@
         }
 
+      areavars[i] = (areavars[i] - areaphes[i]*areaphes[i]/numareavalid[i]) / (numareavalid[i]-1.);
       areaphes[i] = areaphes[i] / numareavalid[i];
-      areavars[i] = (areavars[i] - areaphes[i]*areaphes[i]/numareavalid[i]) / (numareavalid[i]-1.);
-
-      if (areavars[i] > 0.)
-        areavars[i] = TMath::Sqrt(areavars[i]);
-      else
+
+      if (areavars[i] < 0.)
         {
           *fLog << warn << GetDescriptor() << ": No pixels with valid variance of photo-electrons found "
@@ -1384 +1388 @@
 
       avffactorphotons[aidx] += ffactor;
-      avffactorphotvar[aidx] += pix.GetMeanFFactorFADC2PhotVar();
+      avffactorphotvar[aidx] += ffactor*ffactor;
       numffactor[aidx]++;
     }
@@ -1390 +1394 @@
   for (UInt_t i=0; i<nareas; i++)
     {
-      avffactorphotons[i] /= numffactor[i];
-      avffactorphotvar[i] /= numffactor[i];
+
+      if (numffactor[i] == 0)
+        {
+          *fLog << warn << GetDescriptor() << ": No pixels with valid total F-Factor found "
+                << "in area index: " << i << endl;
+          continue;
+        }
+
+      avffactorphotvar[i] = (avffactorphotvar[i] - avffactorphotons[i]*avffactorphotons[i]/numffactor[i]) / (numffactor[i]-1.);
+      avffactorphotons[i] = avffactorphotons[i] / numffactor[i];
+
+      if (avffactorphotvar[i] < 0.)
+        {
+          *fLog << warn << GetDescriptor() << ": No pixels with valid variance of total F-Factor found "
+                << "in area index: " << i << endl;
+          continue;
+        }
 
       lowlim  [i] = 1.1;   // Lowest known F-Factor of a PMT