Changeset 3007 for trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

Timestamp:

02/02/04 22:52:53 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc (modified) (9 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -148 +148 @@
     CLRBIT(fFlags, kUsePinDiodeFit);
 
-    fEvents = 0;
-    fCosmics = 0;
-    fNumHiGainSamples = 0;
-    fNumLoGainSamples = 0;
-    fConversionHiLo = 0;
+    fEvents            = 0;
+    fCosmics           = 0;
+    fNumHiGainSamples  = 0;
+    fNumLoGainSamples  = 0;
+    fConversionHiLo    = 0;
     fNumExcludedPixels = 0;
-    
+
     fColor = kECT1;
 }
@@ -287 +287 @@
         MCalibrationPix &pix = (*fCalibrations)[i];
         pix.DefinePixId(i);
-        MHCalibrationPixel *hist = pix.GetHist();
-        
-        hist->SetTimeFitRangesHiGain(fSignals->GetFirstUsedSliceHiGain(),
-                                     fSignals->GetLastUsedSliceHiGain());
-        hist->SetTimeFitRangesLoGain(fSignals->GetFirstUsedSliceLoGain(),
-                                     fSignals->GetLastUsedSliceLoGain());
+
+        pix.SetAbsTimeBordersHiGain(fSignals->GetFirstUsedSliceHiGain(),
+                                    fSignals->GetLastUsedSliceHiGain());
+        pix.SetAbsTimeBordersLoGain(fSignals->GetFirstUsedSliceLoGain(),
+                                    fSignals->GetLastUsedSliceLoGain());
         
         if (!TESTBIT(fFlags,kUseQualityChecks))
           pix.SetExcludeQualityCheck();
 
-      }
+     }
     
     //
@@ -431 +430 @@
   fEvents++;
 
-  Int_t overflow = 0;
+  Int_t   overflow      = 0;
+  Float_t referencetime = 0.;
   
   //
   // Create a (second) loop to do fill the calibration histograms
-  // 
-  
+  // Search for: a signal in MExtractedSignalCam 
+  //             a time in MArrivalTime. 
+  // Fill histograms with:
+  //             charge
+  //             charge vs. event nr.
+  //             relative arrival time w.r.t. pixel 1
+  //
   while (pixel.Next())
     {
@@ -452 +457 @@
       const Float_t sumlo  = sig.GetExtractedSignalLoGain();
 
-      Float_t mtime = 0.;
+      Float_t abstime = 0.;
+      Float_t reltime = 0.;
 
       if (TESTBIT(fFlags,kUseTimes))
         {
-          //
-          // first, have a look in MArrivalTime, 
+
+          //
+          // Have a look in MArrivalTime, 
           // otherwise search the position of maximum bin 
           // in MRawEvtData
           //
           if (fArrivalTime)
-            mtime = (*fArrivalTime)[pixid];
+            {
+              abstime = (*fArrivalTime)[pixid];
+              reltime = abstime - (*fArrivalTime)[1];
+            }
+          
           else
-            if (sig.IsLoGainUsed())
-              mtime = (Double_t)pixel.GetIdxMaxLoGainSample();
-            else
-              mtime = (Double_t)pixel.GetIdxMaxHiGainSample();
+            {
+              if (pixid == 1)
+                referencetime = (Float_t)pixel.GetIdxMaxHiGainSample();
+
+              if (sig.IsLoGainUsed())
+                {
+                  abstime = (Float_t)pixel.GetIdxMaxLoGainSample();
+                  reltime = abstime - referencetime;
+                }
+              else
+                {
+                  abstime = (Float_t)pixel.GetIdxMaxHiGainSample();
+                  reltime = abstime - referencetime;
+                }
+            }
         }
       
@@ -481 +503 @@
           if (TESTBIT(fFlags,kUseTimes))
             {
-              if (!blindpixel.FillTime(mtime))
+              if (!blindpixel.FillTime(reltime))
                 *fLog << warn << 
-                  "Overflow or Underflow occurred filling Blind Pixel time = " << mtime << endl;
+                  "Overflow or Underflow occurred filling Blind Pixel time = " << reltime << endl;
             }
           
@@ -499 +521 @@
           if (TESTBIT(fFlags,kUseTimes))
             {
-              if (!pindiode.FillTime(mtime))
+              if (!pindiode.FillAbsTime(abstime))
                 *fLog << warn << 
-                  "Overflow or Underflow occurred filling PINDiode: time = " << mtime << endl;
+                  "Overflow or Underflow occurred filling PINDiode abs. time = " << abstime << endl;
+              if (!pindiode.FillRelTime(reltime))
+                *fLog << warn << 
+                  "Overflow or Underflow occurred filling PINDiode rel. time = " << reltime << endl;
             }
           
@@ -528 +553 @@
               if (TESTBIT(fFlags,kUseTimes))
                 {
-                  if (!pix.FillTimeLoGain(mtime)) 
-                    *fLog << warn << "Could not fill Lo Gain Time of pixel: " 
-                          << pixid << " time = " << mtime << endl;
+                  if (!pix.FillAbsTimeLoGain(abstime)) 
+                    *fLog << warn << "Could not fill Lo Gain Abs. Time of pixel: " 
+                          << pixid << " time = " << abstime << endl;
+                  if (!pix.FillRelTimeLoGain(reltime)) 
+                    *fLog << warn << "Could not fill Lo Gain Rel. Time of pixel: " 
+                          << pixid << " time = " << reltime << endl;
                 }
             } /* if (sig.IsLoGainUsed()) */
@@ -541 +569 @@
               if (TESTBIT(fFlags,kUseTimes))
                 {
-                  if (!pix.FillTimeHiGain(mtime))
-                    *fLog << warn << "Could not fill Hi Gain Time of pixel: " 
-                          << pixid << " time = " << mtime << endl;
+                  if (!pix.FillAbsTimeHiGain(abstime))
+                    *fLog << warn << "Could not fill Hi Gain Abs. Time of pixel: " 
+                          << pixid << " time = " << abstime << endl;
+                  if (!pix.FillRelTimeHiGain(reltime))
+                    *fLog << warn << "Could not fill Hi Gain Rel. Time of pixel: " 
+                          << pixid << " time = " << reltime << endl;
                 }
             } /* else (sig.IsLoGainUsed()) */
@@ -606 +637 @@
           MPedestalPix &ped = (*fPedestals)[fBlindPixelId];
           //
-          // retrieve the blind pixel histogram container
+          // retrieve the histogram containers
           //
           MHCalibrationBlindPixel *hist = blindpixel.GetHist();
+          MHPedestalPixel *pedhist = ped.GetHist();
           //
           // Set the corresponding values
           //
-          const Float_t peddiff     = ped.GetMean() 
-                                    - ped.GetPedestal()*fSignals->GetNumUsedFADCSlices();
-          const Float_t pederr      = ped.GetMeanErr();
+          const Float_t nslices     = (Float_t)fSignals->GetNumUsedFADCSlices();
+          const Int_t   nentries    = pedhist->GetTotalEntries();
+          
+          const Float_t peddiff     = ped.GetMean() - ped.GetPedestal()*nslices;
+
+          Float_t pederr  = ped.GetMeanErr()*ped.GetMeanErr();
+          pederr         += ped.GetPedestalRms()*ped.GetPedestalRms()*nslices*nslices/nentries/nentries;
+          pederr          = TMath::Sqrt(pederr);
+          
           const Float_t pedsigma    = ped.GetSigma();
           const Float_t pedsigmaerr = ped.GetSigmaErr();