Changeset 5505 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

11/29/04 18:46:05 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MPedCalcFromLoGain.cc (modified) (3 diffs)
• MPedCalcPedRun.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -137 +137 @@
 
 #include "MExtractTimeAndCharge.h"
+#include "MExtractTimeAndChargeDigitalFilter.h"
 
 #include "MParList.h"
@@ -245 +246 @@
       SetExtractWindow(fExtractor->GetHiGainFirst(),(Int_t)fExtractor->GetNumHiGainSamples());
       lastavailable = losamples-1;
+      if (fExtractor->InheritsFrom("MExtractTimeAndChargeDigitalFilter"))
+        {
+          MExtractTimeAndChargeDigitalFilter* df = (MExtractTimeAndChargeDigitalFilter*)fExtractor;
+          if (!df->IsWeightsSet())
+            if (!df->ReadWeightsFile(df->GetNameWeightsFile()))
+              return kFALSE;
+        }
     }
 
@@ -438 +446 @@
   const Bool_t logainabflag = (pixel->HasABFlag() + pixel->GetNumHiGainSamples()) & 0x1;
   Float_t dummy;
-  fExtractor->FindTimeAndChargeLoGain(logain,sum,dummy,dummy,dummy,sat,ped,logainabflag);
+  fExtractor->FindTimeAndChargeHiGain(logain,logain,sum,dummy,dummy,dummy,sat,ped,logainabflag);
 }
 

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -122 +122 @@
 
 #include "MExtractTimeAndCharge.h"
+#include "MExtractTimeAndChargeDigitalFilter.h"
 
 #include "MParList.h"
@@ -204 +205 @@
 
   if (fExtractor)
-    SetExtractWindow(fExtractor->GetHiGainFirst(),(Int_t)fExtractor->GetNumHiGainSamples());
-
+    {
+      SetExtractWindow(fExtractor->GetHiGainFirst(),(Int_t)fExtractor->GetNumHiGainSamples());
+      if (fExtractor->InheritsFrom("MExtractTimeAndChargeDigitalFilter"))
+        {
+          MExtractTimeAndChargeDigitalFilter* df = (MExtractTimeAndChargeDigitalFilter*)fExtractor;
+          if (!df->IsWeightsSet())
+            if (!df->ReadWeightsFile(df->GetNameWeightsFile()))
+              return kFALSE;
+        }
+    }
+  
   MExtractPedestal::ReInit(pList);
 
@@ -318 +328 @@
 }
 
+
 void MPedCalcPedRun::CalcExtractor( MRawEvtPixelIter *pixel, Float_t &sum, MPedestalPix &ped)
 {