Changeset 4648 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

08/17/04 13:31:40 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MPedCalcFromLoGain.cc (modified) (4 diffs)
• MPedCalcFromLoGain.h (modified) (1 diff)

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -357 +357 @@
         return kFALSE;
 
+    if (fNumEventsDump<=0 && fPedestalUpdate)
+    {
+        *fLog << warn << "Pedestal Update switched on and Number of Events to dump <= 0... fNumEventsDump=1000" << endl;
+        fNumEventsDump=1000;
+    }
+
     return kTRUE;
 }
@@ -518 +524 @@
         // Calculate the amplitude of the 150MHz "AB" noise
 
-        Int_t abFlag = (fRunHeader->GetNumSamplesHiGain()
-                        + fLoGainFirst
-                        + pixel.HasABFlag()) & 0x1;
-        for (Int_t islice=0; islice<fWindowSizeLoGain; islice+=2)
+        if (pixel.IsABFlagValid())
         {
-            Int_t sliceAB0 = islice + abFlag;
-            Int_t sliceAB1 = islice - abFlag + 1;
-            fSumAB0[idx] += firstSlice[sliceAB0];
-            fSumAB1[idx] += firstSlice[sliceAB1];
+            const Int_t abFlag = (fRunHeader->GetNumSamplesHiGain()
+                                  + fLoGainFirst + pixel.HasABFlag()) & 0x1;
+            for (Int_t islice=0; islice<fWindowSizeLoGain; islice+=2)
+            {
+                const Int_t sliceAB0 = islice + abFlag;
+                const Int_t sliceAB1 = islice - abFlag + 1;
+                fSumAB0[idx] += firstSlice[sliceAB0];
+                fSumAB1[idx] += firstSlice[sliceAB1];
+            }
         }
 
@@ -543 +551 @@
     if (fPedestalUpdate)
     {
-        fPedestals->ReCalc(*fGeom);
+        //fPedestals->ReCalc(*fGeom);
         fPedestals->SetReadyToSave();
     }
@@ -606 +614 @@
     if (IsEnvDefined(env, prefix, "NumEventsDump", print))
     {
-        SetDumpEvents(GetEnvValue(env, prefix, "NumEventsDump", fNumEventsDump));
+        SetNumEventsDump(GetEnvValue(env, prefix, "NumEventsDump", fNumEventsDump));
         rc = kTRUE;
     }

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.h

@@ -65 +65 @@
     void SetWindowSize(Byte_t windowh=fgHiGainWindowSize, Byte_t windowl=fgLoGainWindowSize);
     void SetMaxHiGainVar(Byte_t maxvar=fgMaxHiGainVar);
-    void SetDumpEvents(UInt_t dumpevents = 0) {fNumEventsDump = dumpevents;}
+    void SetNumEventsDump(UInt_t dumpevents = 0) { fNumEventsDump = dumpevents; }
     void SetPedestalUpdate(Bool_t pedupdate)  {fPedestalUpdate = pedupdate;}