Changeset 6502 for trunk/MagicSoft

Timestamp:

02/15/05 18:59:34 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MTask.cc (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (2 diffs)
• mpedestal/MExtractPedestal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -105 +105 @@
    * mjobs/MJStar.cc:
      - copy tree 'MonteCarlo' from old into new files
+
+   * mjobs/MJPedestal.cc:
+     - removed wrong use of MFEventSelector
+
+   * mpedestal/MExtractPedestal.cc:
+     - made sure that fExtractor is correctly pre- and 
+       postprocessed.
+
+   * mbase/MTask.cc:
+     - don't preprocess a task if it has been preprocessed already
 
 

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -207 +207 @@
 // Sets the preprocessed flag dependend on the return value of PreProcess.
 // Resets number of executions and cpu consumtion timer.
+// If task has already been preprocessed return kTRUE.
 //
 Int_t MTask::CallPreProcess(MParList *plist)
 {
+    if (fIsPreprocessed)
+        return kTRUE;
+
     // This does not reset the counter!
     fStopwatch->Reset();

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -62 +62 @@
 // Other basic classes
 #include "MExtractTimeAndCharge.h"
-#include "MFEventSelector.h"
 
 // parameter containers
@@ -981 +980 @@
     }
 
-    MFEventSelector sel;
-    sel.SetNumSelectEvts(0);
-    
-    if (fExtractionType!=kFundamental)
-      {
-        fExtractor->SetFilter(&sel);
-        tlist.AddToList(&sel);
-        tlist.AddToList(fExtractor);
-      }
-
     // ----------------------------------------------------------------------
     //   Now we make sure, that in all cases the ranges are setup correctly

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -366 +366 @@
   Print();
 
-  // FIMXE: MUST call fExtractor->PreProcess()???
-  return kTRUE;
+  return fExtractor ? fExtractor->CallPreProcess(pList) : kTRUE;
 }
 
@@ -455 +454 @@
 {
   fPedestalsIn = NULL;
-  return kTRUE;
+  return fExtractor ? fExtractor->CallPostProcess() : kTRUE;
 }