Changeset 5504 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

11/29/04 16:45:57 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MExtractPedestal.cc (modified) (3 diffs)
• MPedCalcFromLoGain.cc (modified) (6 diffs)
• MPedCalcPedRun.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -150 +150 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MExtractPedestal.h"
+#include "MExtractTimeAndCharge.h"
 
 #include "MParList.h"
@@ -355 +356 @@
   
   *fLog << inf;
-  Print();
   
   return kTRUE;
@@ -419 +419 @@
   }
   
-  
+  if (fExtractor)
+    fExtractor->InitArrays();
+  
+  Print();
+
   return kTRUE;
 }

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -100 +100 @@
 //   fCheckWinFirst   =  fgCheckWinFirst   =  0 
 //   fCheckWinLast    =  fgCheckWinLast    =  29
-//   fExtractWinFirst =  fgExtractWinFirst =  0 
+//   fExtractWinFirst =  fgExtractWinFirst =  15 
 //   fExtractWinSize  =  fgExtractWinSize  =  6
 //   fMaxSignalVar    =  fgMaxSignalVar    = 40;
@@ -108 +108 @@
 //  to set the Window in which a signal is searched
 //
-//  SetExtractWindow(fExtractWindFirst,fExtractWinSize);
+//  SetExtractWindow(fExtractWinFirst,fExtractWinSize);
 //  to set the Window from which a signal is extracted
 //
@@ -239 +239 @@
   const UShort_t losamples = fRunHeader->GetNumSamplesLoGain();
 
+  UShort_t lastavailable   = hisamples+losamples-1;
+
   if (fExtractor)
-    SetExtractWindow(hisamples+fExtractor->GetHiGainFirst(),hisamples+fExtractor->GetHiGainLast());
-  
+    {
+      SetExtractWindow(fExtractor->GetHiGainFirst(),(Int_t)fExtractor->GetNumHiGainSamples());
+      lastavailable = losamples-1;
+    }
+
   // If the size is not yet set, set the size
   if (fSumx.GetSize()==0)
@@ -250 +255 @@
   }
   
-  MExtractPedestal::ReInit(pList);
-  
-  UShort_t lastavailable = hisamples+losamples-1;
-
-   if (fExtractWinLast > lastavailable) //changed to override check
+  if (fExtractWinLast > lastavailable) //changed to override check
    {
      const UShort_t diff = fExtractWinLast - lastavailable;
@@ -264 +265 @@
      fExtractWinSize -= diff;
    }
-
-   lastavailable = fRunHeader->GetNumSamplesHiGain()-1;
-
+  
+   lastavailable = hisamples + losamples -1;
+   
    if (fCheckWinLast > lastavailable) //changed to override check
-   {
+     {
        *fLog << warn << GetDescriptor();
        *fLog << " - WARNING: Last Check Window slice out of range...adjusting to last available slice ";
        *fLog << lastavailable << endl;
-
+       
        fCheckWinLast = lastavailable;
-   }
-
+     }
+
+  MExtractPedestal::ReInit(pList);
+  
   return kTRUE;
 }
@@ -488 +491 @@
 
   fPedestalsOut->SetReadyToSave();
+
   return kTRUE;
 }

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -202 +202 @@
 Bool_t MPedCalcPedRun::ReInit(MParList *pList)
 {
+
+  if (fExtractor)
+    SetExtractWindow(fExtractor->GetHiGainFirst(),(Int_t)fExtractor->GetNumHiGainSamples());
 
   MExtractPedestal::ReInit(pList);
@@ -291 +294 @@
         CalcSums( &pixel, sum, ab0, ab1);
 
-      const Float_t msum = (Float_t)sum;
-      
-      fSumx[idx]          += msum;
-      fAreaSumx[aidx]     += msum;
-      fSectorSumx[sector] += msum;      
-
-      const Float_t sqrsum  = msum*msum;
+      fSumx[idx]          += sum;
+      fAreaSumx[aidx]     += sum;
+      fSectorSumx[sector] += sum;      
+
+      const Float_t sqrsum  = sum*sum;
       fSumx2[idx]          += sqrsum;
       fAreaSumx2[aidx]     += sqrsum;
@@ -316 +317 @@
   return kTRUE;
 }
-
-
 
 void MPedCalcPedRun::CalcExtractor( MRawEvtPixelIter *pixel, Float_t &sum, MPedestalPix &ped)
@@ -328 +327 @@
   Float_t dummy;
   fExtractor->FindTimeAndChargeHiGain(first,logain,sum,dummy,dummy,dummy,sat,ped,abflag);
+
 }
 
@@ -458 +458 @@
 Bool_t MPedCalcPedRun::IsPedBitSet()
 {
+
   if (fRunHeader->GetRunNumber() < gkFirstRunWithFinalBits)
     return kFALSE;