Changeset 5219 for trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

Timestamp:

10/11/04 17:36:35 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc (modified) (15 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -190 +190 @@
     fRunHeader = NULL;
     fPedestals = NULL;
+
+    // If the size is yet set, set the size
+    if (fSumx.GetSize()>0)
+    {
+        // Reset contents of arrays.
+        fSumx.Reset();
+        fSumx2.Reset();
+        fSumAB0.Reset();
+        fSumAB1.Reset();
+
+        fAreaSumx. Reset();
+        fAreaSumx2.Reset();
+        fAreaSumAB0.Reset();
+        fAreaSumAB1.Reset();
+        fAreaValid.Reset();
+        
+        fSectorSumx. Reset();
+        fSectorSumx2.Reset();
+        fSectorSumAB0.Reset();
+        fSectorSumAB1.Reset();
+        fSectorValid.Reset();
+    }
 }
 
@@ -241 +263 @@
     {
         *fLog << warn;
-        *fLog << GetDescriptor() << ": HiGain window currently set to 0, will set it to 2 samples ";
+        *fLog << GetDescriptor() << ": HiGain window currently set to 0, will set it to 2 samples " << endl;
         fWindowSizeHiGain = 2;
     }
@@ -248 +270 @@
     {
         *fLog << warn;
-        *fLog << GetDescriptor() << ": LoGain window currently set to 0, will set it to 2 samples ";
+        *fLog << GetDescriptor() << ": LoGain window currently set to 0, will set it to 2 samples " << endl;
         fWindowSizeLoGain = 2;
     }
@@ -346 +368 @@
 Bool_t MPedCalcPedRun::ReInit(MParList *pList)
 {
+
   Int_t lastdesired   = (Int_t)fLoGainLast;
   Int_t lastavailable = (Int_t)fRunHeader->GetNumSamplesLoGain()-1;
@@ -414 +437 @@
   if (fSumx.GetSize()==0)
     {
-      fSumx. Set(npixels);
-      fSumx2.Set(npixels);
-      
-      fAreaSumx. Set(areas);
-      fAreaSumx2.Set(areas);
-      fAreaValid.Set(areas);
-      
-      fSectorSumx. Set(sectors);
-      fSectorSumx2.Set(sectors);
-      fSectorValid.Set(sectors);
-      
-      fSumx.Reset();
+      fSumx.  Set(npixels);
+      fSumx2. Set(npixels);
+      fSumAB0.Set(npixels);
+      fSumAB1.Set(npixels);
+      
+      fAreaSumx.  Set(areas);
+      fAreaSumx2. Set(areas);
+      fAreaSumAB0.Set(areas);
+      fAreaSumAB1.Set(areas);
+      fAreaValid. Set(areas);
+      
+      fSectorSumx.  Set(sectors);
+      fSectorSumx2. Set(sectors);
+      fSectorSumAB0.Set(sectors);
+      fSectorSumAB1.Set(sectors);
+      fSectorValid. Set(sectors);
+      
+      fSumx. Reset();
       fSumx2.Reset();
     }
@@ -454 +483 @@
 Int_t MPedCalcPedRun::Process()
 {
+
   MRawEvtPixelIter pixel(fRawEvt);
   
@@ -467 +497 @@
       UInt_t sum = 0;
       UInt_t sqr = 0;
+      UInt_t ab0 = 0;
+      UInt_t ab1 = 0;
+      Int_t  cnt = 0;
 
       if (fWindowSizeHiGain != 0)
@@ -474 +507 @@
               sum += *ptr;
               sqr += *ptr * *ptr;
+
+              if (pixel.IsABFlagValid())
+                {
+                  const Int_t abFlag = (fHiGainFirst + pixel.HasABFlag() + cnt) & 0x1;
+                  if (abFlag)
+                    ab1 += *ptr;
+                  else
+                    ab0 += *ptr;
+
+                  cnt++;
+                }
             }
           while (++ptr != end);
         }
+
+      cnt = 0;
       
       if (fWindowSizeLoGain != 0)
@@ -488 +534 @@
               sum += *ptr;
               sqr += *ptr * *ptr;
+
+              if (pixel.IsABFlagValid())
+                {
+                  const Int_t abFlag = (fLoGainFirst + pixel.GetNumHiGainSamples() + pixel.HasABFlag() + cnt) 
+                                      & 0x1;
+                  if (abFlag)
+                    ab1 += *ptr;
+                  else
+                    ab0 += *ptr;
+
+                  cnt++;
+                }
+
             }
           while (++ptr != end);
@@ -506 +565 @@
       fAreaSumx[aidx]     += msum;
       fSectorSumx[sector] += msum;      
+
       //
       // The old version:
@@ -518 +578 @@
       fAreaSumx2[aidx]     += sqrsum;
       fSectorSumx2[sector] += sqrsum;      
+
+      //
+      // Now, the sums separated for AB0 and AB1
+      //
+      fSumAB0[idx]        += ab0;
+      fSumAB1[idx]        += ab1;
+
+      fAreaSumAB0[aidx]   += ab0;
+      fAreaSumAB1[aidx]   += ab1;      
+      
+      fSectorSumAB0[aidx] += ab0;
+      fSectorSumAB1[aidx] += ab1;      
     }
   
@@ -532 +604 @@
 Int_t MPedCalcPedRun::PostProcess()
 {
+
   // Compute pedestals and rms from the whole run
   const ULong_t n     = fNumSamplesTot;
@@ -563 +636 @@
       higainVar /= (Float_t)(fWindowSizeHiGain+fWindowSizeLoGain);
       // 3. Calculate the RMS from the Variance:
-      (*fPedestals)[pixid].Set(higainped, higainVar < 0 ? 0. : TMath::Sqrt(higainVar));
+      const Float_t rms = higainVar<0 ? 0. : TMath::Sqrt(higainVar);
+      // 4. Calculate the amplitude of the 150MHz "AB" noise
+      const Float_t abOffs = (fSumAB0.At(pixid) - fSumAB1.At(pixid)) / n;
+      
+      *fLog << "THIS is the aboffs: " << abOffs << endl;
+
+      (*fPedestals)[pixid].Set(higainped,rms,abOffs);
 
     }
@@ -594 +673 @@
       //    in order to be comparable to the mean of pedRMS of that area
       higainrms *= TMath::Sqrt((Float_t)napix);
-
-      fPedestals->GetAverageArea(aidx).Set(higainped, higainrms);
+      // 5. Calculate the amplitude of the 150MHz "AB" noise
+      const Float_t abOffs = (fAreaSumAB0.At(aidx) - fAreaSumAB1.At(aidx)) / an;
+
+      fPedestals->GetAverageArea(aidx).Set(higainped, higainrms,abOffs);
     }
   
@@ -625 +706 @@
       //    in order to be comparable to the mean of pedRMS of that sector
       higainrms *= TMath::Sqrt((Float_t)nspix);
-
-      fPedestals->GetAverageSector(sector).Set(higainped, higainrms);
+      // 5. Calculate the amplitude of the 150MHz "AB" noise
+      const Float_t abOffs = (fSectorSumAB0.At(sector) - fSectorSumAB1.At(sector)) / sn;
+
+      fPedestals->GetAverageSector(sector).Set(higainped, higainrms, abOffs);
     }