Changeset 5570 for trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

Timestamp:

12/08/04 18:02:12 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (modified) (9 diffs)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -151 +151 @@
 Bool_t MJPedestal::ReadPedestalCam()
 {
-    if (IsNoStorage())
-        return kFALSE;
-
     const TString fname = GetOutputFile();
 
-    if (gSystem->AccessPathName(fname, kFileExists))
-    {
-        *fLog << warn << "Input file " << fname << " doesn't exist, will create it." << endl;
-        return kFALSE;
-    }
-
-    *fLog << inf << "Reading from file: " << fname << endl;
+    *fLog << inf << "Reading pedestals from file: " << fname << endl;
 
     TFile file(fname, "READ");
@@ -198 +189 @@
     const TString fname = Form("%s/calib%06d.root",fPathIn.Data(), fSequence.GetSequence());
 
-    *fLog << inf << "Reading from file: " << fname << endl;
+    *fLog << inf << "Reading extractor from file: " << fname << endl;
 
     TFile file(fname, "READ");
@@ -213 +204 @@
         return NULL;
     }
-    return o ? (MExtractor*)o->Clone() : NULL;
+
+    return o ? (MExtractor*)o->Clone("ExtractSignal") : NULL;
 }
 
@@ -684 +676 @@
     if (fExtractor)
         delete fExtractor;
-    fExtractor = ext ? (MExtractor*)ext->Clone() : NULL;
+    fExtractor = ext ? (MExtractor*)ext->Clone(ext->GetName()) : NULL;
 }
 
@@ -721 +713 @@
     SetNoStorage(GetEnv("DisableOutput", IsNoStorage()));
 
-    MTaskEnv tenv;
+    MTaskEnv tenv("ExtractSignal");
     tenv.SetDefault(fExtractor);
 
@@ -737 +729 @@
 
     SetExtractor((MExtractor*)tenv.GetTask());
+
     return kTRUE;
 }
@@ -816 +809 @@
     }
 
-    //if (!CheckEnv())
-    //    return kFALSE;
-
-    CheckEnv();
+    if (!CheckEnv())
+        return kFALSE;
 
     // --------------------------------------------------------------------------------
@@ -944 +935 @@
     }
 
+    /*
     if (!fPathIn.IsNull())
     {
@@ -949 +941 @@
         fExtractor = 0;
     }
-
-    //
-    // Check that the extractor has the bit Noise Calculation() set which 
-    // means that the each "sliding" of the sliding window is not applied
-    //
-    if (fExtractor)
-        fExtractor->SetNoiseCalculation(fExtractorResolution);
-
+    */
     //
     // Execute the eventloop