Changeset 5153 for trunk/MagicSoft

Timestamp:

09/30/04 18:47:46 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
        window ranges into the low-gain
 
+   * mjobs/MJPedestal.cc
+     - use MPedCalcFromLoGain if IsUseData() is set
 
  2004/09/29: Hendrik Bartko, Diego Tescaro, Markus Gaug

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -64 +64 @@
 #include "MBadPixelsMerge.h"
 #include "MPedCalcPedRun.h"
+#include "MPedCalcFromLoGain.h"
 
 ClassImp(MJPedestal);
@@ -609 +610 @@
     MBadPixelsMerge merge(&fBadPixels);
 
-    MPedCalcPedRun  pedcalc;
+    MPedCalcPedRun     pedcalc;
+    MPedCalcFromLoGain pedlogain;
+    pedlogain.SetPedestalUpdate(kFALSE);
 
     MTaskEnv taskenv("ExtractPedestal");
-    taskenv.SetDefault(&pedcalc);
+    if (IsUseData())
+      taskenv.SetDefault(&pedlogain);
+    else
+      taskenv.SetDefault(&pedcalc);
 
     if (fExtractor)
     {
-        pedcalc.SetWindowSize((Int_t)fExtractor->GetNumHiGainSamples());
-        pedcalc.SetRange(fExtractor->GetHiGainFirst(), fExtractor->GetHiGainLast());
+      if (IsUseData())
+        pedlogain.SetWindowSize(12,(Int_t)fExtractor->GetNumHiGainSamples());          
+      else
+        {
+          pedcalc.SetWindowSize((Int_t)fExtractor->GetNumHiGainSamples());
+          pedcalc.SetRange(fExtractor->GetHiGainFirst(), fExtractor->GetHiGainLast());
+        }
     }
   /*