Changeset 6979 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/27/05 16:46:24 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibTest.cc (modified) (6 diffs)
• MJCalibTest.h (modified) (1 diff)
• MJCalibrateSignal.cc (modified) (6 diffs)
• MJCalibrateSignal.h (modified) (2 diffs)
• MJCalibration.cc (modified) (11 diffs)
• MJCalibration.h (modified) (2 diffs)
• MJCut.cc (modified) (1 diff)
• MJCut.h (modified) (1 diff)
• MJPedestal.cc (modified) (7 diffs)
• MJPedestal.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -95 +95 @@
 // Default constructor. 
 //
-// Sets fUseCosmicsFilter to kTRUE, fRuns to 0, fExtractor to NULL, fTimeExtractor to NULL
+// Sets fUseCosmicsFilter to kTRUE, fExtractor to NULL, fTimeExtractor to NULL
 // fDisplay to kNormalDisplay
 //
@@ -210 +210 @@
 const char* MJCalibTest::GetOutputFile() const
 {
-    const TString name(GetOutputFileName());
-    if (name.IsNull())
-        return "";
-
-    return Form("%s/%s", fPathOut.Data(), name.Data());
-}
-
-
-const char* MJCalibTest::GetOutputFileName() const
-{
-
-  if (fSequence.IsValid())
-    return Form("calib%08d.root", fSequence.GetSequence());
-  
-  if (!fRuns)
-    return "";
-  
-  return Form("%s-F1.root", (const char*)fRuns->GetRunsAsFileName());
-  
+    return Form("%s/calib%08d.root", fPathOut.Data(), fSequence.GetSequence());
 }
 
@@ -279 +261 @@
 }
 
-Bool_t MJCalibTest::ProcessFile(MPedestalCam &pedcam)
+Bool_t MJCalibTest::Process(MPedestalCam &pedcam)
 {
-  
-  if (!fSequence.IsValid())
-    {
-      if (!fRuns)
-        {
-            *fLog << err << "ERROR - Sequence invalid and no runs chosen!" << endl;
-            return kFALSE;
-        }
-      
-      if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
-        {
-          *fLog << err << "Number of files found doesn't match number of runs... abort."
-                << fRuns->GetNumRuns() << " vs. " << fRuns->GetNumEntries() << endl;
-          return kFALSE;
-        }
-      *fLog << "Calibrate data from ";
-      *fLog << "Runs " << fRuns->GetRunsAsString() << endl;
-      *fLog << endl;
-    }
-  
+    if (!fSequence.IsValid())
+    {
+          *fLog << err << "ERROR - Sequence invalid..." << endl;
+          return kFALSE;
+    }
+
+    *fLog << inf;
+    fLog->Separator(GetDescriptor());
+    *fLog << "Calculate calibration test from Sequence #";
+    *fLog << fSequence.GetSequence() << endl << endl;
+
   CheckEnv();
   
@@ -307 +280 @@
   
   *fLog << "Calibrate Calibration data from ";
-  if (fSequence.IsValid())
-    *fLog << "Sequence #" << fSequence.GetSequence() << endl;
-  else
-    *fLog << "Runs " << fRuns->GetRunsAsString() << endl;
+  *fLog << "Sequence #" << fSequence.GetSequence() << endl;
   *fLog << endl;
   
@@ -415 +385 @@
 
   if (IsUseRawData())
-    rawread.AddFiles(fSequence.IsValid() ? iter : *fRuns);
+    rawread.AddFiles(iter);
   else
-    static_cast<MRead&>(read).AddFiles(fSequence.IsValid() ? iter : *fRuns);
+    static_cast<MRead&>(read).AddFiles(iter);
 
   // Check for interleaved events
@@ -475 +445 @@
   MCalibrationTestCalc  testcalc;
 
-  if (!fSequence.IsValid())
-    {
-      testcalc.SetOutputPath(fPathOut);
-      testcalc.SetOutputFile(Form("%s-TestCalibStat.txt",(const char*)fRuns->GetRunsAsFileName()));
-    }
-  
   MHCamEvent evt0(0,"Signal", "Un-Calibrated Signal;;S [FADC cnts]" );
   MHCamEvent evt1(0,"CalSig", "Cal. and Interp. Sig. by Pixel Size Ratio;;S [phe]");

trunk/MagicSoft/Mars/mjobs/MJCalibTest.h

@@ -74 +74 @@
   void SetNormalDisplay()    { fDisplayType = kNormalDisplay;    }
   
-  Bool_t ProcessFile(MPedestalCam &pedcam);
+  Bool_t Process(MPedestalCam &pedcam);
   
   ClassDef(MJCalibTest, 0) // Tool to calibrate and test the calibration run itself

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -149 +149 @@
 }
 
-const char* MJCalibrateSignal::GetInputFile() const
-{
-    const TString name(GetInputFileName());
-    if (name.IsNull())
-        return "";
-
-    return Form("%s/%s", fPathIn.Data(), name.Data());
-}
-
-const char* MJCalibrateSignal::GetInputFileName() const
-{
-
-  if (fSequence.IsValid())
-    return Form("calib%08d.root", fSequence.GetSequence());
-  
-  //  if (!fCruns)
-    return "";
-  
-  //  return Form("%s-F1.root", (const char*)fCruns->GetRunsAsFileName());
-}
-
 Bool_t MJCalibrateSignal::WriteResult(TObjArray &cont)
 {
@@ -181 +160 @@
 Bool_t MJCalibrateSignal::ReadCalibration(TObjArray &l, MBadPixelsCam &cam, MExtractor* &ext2, MExtractor* &ext3, TString &geom) const
 {
-
-    const TString fname = GetInputFile();
+    TString fname = Form("%s/calib%08d.root", fPathIn.Data(), fSequence.GetSequence());
 
     *fLog << inf << "Reading from file: " << fname << endl;
@@ -274 +252 @@
 }
 
-Bool_t MJCalibrateSignal::ProcessFile(MPedestalCam &pedcamab, MPedestalCam &pedcambias, 
-                                      MPedestalCam &pedcamextr)
+Bool_t MJCalibrateSignal::Process(MPedestalCam &pedcamab, MPedestalCam &pedcambias,
+                                  MPedestalCam &pedcamextr)
 {
     if (!fSequence.IsValid())
     {
-        if (!fRuns)
-        {
-          *fLog << err << "ERROR - Sequence invalid and no runs chosen!" << endl;
+          *fLog << err << "ERROR - Sequence invalid..." << endl;
           return kFALSE;
-        }
-
-        if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
-        {
-            *fLog << err << "Number of files found doesn't match number of runs... abort."
-                << fRuns->GetNumRuns() << " vs. " << fRuns->GetNumEntries() << endl;
-            return kFALSE;
-        }
-        *fLog << "Calibrate data from ";
-        *fLog << "Runs " << fRuns->GetRunsAsString() << endl;
-        *fLog << endl;
-    }
+    }
+
+    *fLog << inf;
+    fLog->Separator(GetDescriptor());
+    *fLog << "Calculate calibrated data from Sequence #";
+    *fLog << fSequence.GetSequence() << endl << endl;
+
 
     //if (!CheckEnv())
@@ -303 +274 @@
     // --------------------------------------------------------------------------------
 
-    *fLog << inf;
-    fLog->Separator(GetDescriptor());
-    *fLog << "Calculate calibrated data from runs ";
-    *fLog << fSequence.GetName() << endl;
-    *fLog << endl;
-
-    // --------------------------------------------------------------------------------
-
     MDirIter iter;
     if (fSequence.IsValid())
-      {
+    {
         const Int_t n0 = fSequence.SetupDatRuns(iter, fPathData, IsUseRawData());
         const Int_t n1 = fSequence.GetNumDatRuns();
         if (n0==0)
-          {
+        {
             *fLog << err << "ERROR - No input files of sequence found!" << endl;
             return kFALSE;
-          }
+        }
         if (n0!=n1)
-          {
+        {
             *fLog << err << "ERROR - Number of files found (" << n0 << ") doesn't match number of files in sequence (" << n1 << ")" << endl;
             if (fLog->GetDebugLevel()>4)
@@ -330 +293 @@
             }
             return kFALSE;
-          }
-      }
-    
+        }
+    }
+
     // Read File
     MCalibrationIntensityChargeCam      ichcam;
@@ -464 +427 @@
     case kIsUseRootData: read = &readreal; break;
     }
-    read->AddFiles(fSequence.IsValid() ? iter : *fRuns);
+    read->AddFiles(iter);
 
     const TString fname(Form("%s{s/_D_/_Y_}{s/.raw$/.root}", fPathOut.Data()));

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h

@@ -34 +34 @@
     Bool_t ReadExtractorCosmics(MExtractor* &ext1) const;
 
-    const char*  GetInputFileName() const;
-    const char*  GetInputFile() const;
+    const char* GetInputFile() const;
     
 public:
@@ -42 +41 @@
     ~MJCalibrateSignal();
 
-    Bool_t ProcessFile(MPedestalCam &camab, MPedestalCam &cam1, MPedestalCam &cam2);
+    Bool_t Process(MPedestalCam &camab, MPedestalCam &cam1, MPedestalCam &cam2);
 
     void SetInterlaced     ( const Bool_t b=kTRUE )  { fIsInterlaced      = b; }

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -187 +187 @@
 // Default constructor. 
 //
-// - Sets fRuns to 0, fExtractor to NULL, fTimeExtractor to NULL, fColor to kNONE, 
+// - fExtractor to NULL, fTimeExtractor to NULL, fColor to kNONE,
 //   fDisplay to kNormalDisplay, kRelTimes to kFALSE, kataCheck to kFALSE, kDebug to kFALSE,
 //   kIntensity to kFALSE
@@ -315 +315 @@
     TString title = fDisplay->GetTitle();
     title += "--  Calibration ";
-    title += fSequence.IsValid() ? Form("calib%08d", fSequence.GetSequence()) : (const char*)fRuns->GetRunsAsString();
+    title += Form("calib%08d", fSequence.GetSequence());
     title += "  --";
     fDisplay->SetTitle(title);
@@ -1377 +1377 @@
 // Retrieve the output file written by WriteResult()
 // 
-const char* MJCalibration::GetOutputFile() const
-{
-    const TString name(GetOutputFileName());
-    if (name.IsNull())
-        return "";
-
-    return Form("%s/%s", fPathOut.Data(), name.Data());
-}
-
 const char* MJCalibration::GetOutputFileName() const
 {
-
-  if (fSequence.IsValid())
-    return Form("calib%08d.root", fSequence.GetSequence());
-  if (!fRuns)
-    return "";
-  
-  return Form("%s-F1.root", (const char*)fRuns->GetRunsAsFileName());
+    return Form("%s/calib%08d.root", fPathOut.Data(), fSequence.GetSequence());
 }
 
@@ -1597 +1582 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// Call the ProcessFile(MPedestalCam)
-// 
-Bool_t MJCalibration::Process(MPedestalCam &pedcam)
-{
-    if (!ReadCalibrationCam())
-        return ProcessFile(pedcam);
-
-    return kTRUE;
-}
-
 void MJCalibration::InitBlindPixel(MExtractBlindPixel &blindext,
                                    MHCalibrationChargeBlindCam &blindcam)
 {
 
-  Int_t run = fSequence.IsValid() ? fSequence.GetLastRun() : fRuns->GetRuns()[fRuns->GetNumRuns()-1];
+  Int_t run = fSequence.GetLastRun();
   
   //
@@ -1684 +1657 @@
 // Execute the task list and the eventloop:
 //
-// - Check if there are fRuns, otherwise return
 // - Check the colour of the files in fRuns (FindColor()), otherwise return
 // - Check for consistency between run numbers and number of files
@@ -1716 +1688 @@
 // - WriteResult()
 //
-Bool_t MJCalibration::ProcessFile(MPedestalCam &pedcam)
+Bool_t MJCalibration::Process(MPedestalCam &pedcam)
 {
     if (!fSequence.IsValid())
     {
-        if (!fRuns)
-        {
-            *fLog << err << "No Runs choosen... abort." << endl;
-            return kFALSE;
-        }
-
-        if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
-        {
-            *fLog << err << "Number of files found doesn't match number of runs... abort."
-                << fRuns->GetNumRuns() << " vs. " << fRuns->GetNumEntries() << endl;
-            return kFALSE;
-        }
-    }
-
-    // --------------------------------------------------------------------------------
+          *fLog << err << "ERROR - Sequence invalid..." << endl;
+          return kFALSE;
+    }
 
     *fLog << inf;
     fLog->Separator(GetDescriptor());
-
-    *fLog << "Calculate MCalibrationCam from ";
-    if (fSequence.IsValid())
-        *fLog << "Sequence #" << fSequence.GetSequence() << endl;
-    else
-        *fLog << "Runs " << fRuns->GetRunsAsString() << endl;
-    *fLog << endl;
+    *fLog << "Calculate calibration constants from Sequence #";
+    *fLog << fSequence.GetSequence() << endl << endl;
 
     // --------------------------------------------------------------------------------
     
     if (!CheckEnv())
-      return kFALSE;
+        return kFALSE;
 
     // --------------------------------------------------------------------------------
@@ -1760 +1715 @@
 
     MDirIter iter;
-    if (fSequence.IsValid())
-    {
-        const Int_t n0 = fSequence.SetupCalRuns(iter, fPathData, IsUseRawData());
-        const Int_t n1 = fSequence.GetNumCalRuns();
-        if (n0==0)
+    const Int_t n0 = fSequence.SetupCalRuns(iter, fPathData, IsUseRawData());
+    const Int_t n1 = fSequence.GetNumCalRuns();
+    if (n0==0)
+    {
+        *fLog << err << "ERROR - No input files of sequence found!" << endl;
+        return kFALSE;
+    }
+    if (n0!=n1)
+    {
+        *fLog << err << "ERROR - Number of files found ("
+            << n0 << ") doesn't match number of files in sequence ("
+            << n1 << ")" << endl;
+        if (fLog->GetDebugLevel()>4)
         {
-            *fLog << err << "ERROR - No input files of sequence found!" << endl;
-            return kFALSE;
+            *fLog << dbg << "Files which are searched:" << endl;
+            iter.Print();
         }
-        if (n0!=n1)
-        {
-            *fLog << err << "ERROR - Number of files found (" 
-                  << n0 << ") doesn't match number of files in sequence (" 
-                  << n1 << ")" << endl;
-            if (fLog->GetDebugLevel()>4)
-            {
-                *fLog << dbg << "Files which are searched:" << endl;
-                iter.Print();
-            }
-            return kFALSE;
-        }
+        return kFALSE;
     }
 
@@ -1834 +1786 @@
     if (IsUseRawData())
     {
-        rawread.AddFiles(fSequence.IsValid() ? iter : *fRuns);
+        rawread.AddFiles(iter);
         tlist.AddToList(&rawread);
     }
@@ -1840 +1792 @@
     {
         read.DisableAutoScheme();
-        read.AddFiles(fSequence.IsValid() ? iter : *fRuns);
+        read.AddFiles(iter);
         tlist.AddToList(&read);
     }
@@ -1871 +1823 @@
     calcalc.SetOutputFile("");
     timecalc.SetOutputFile("");
-
-    if (!fSequence.IsValid())
-    {
-        calcalc.SetOutputPath(fPathOut);
-        calcalc.SetOutputFile(Form("%s-ChargeCalibStat.txt",(const char*)fRuns->GetRunsAsFileName()));
-        timecalc.SetOutputPath(fPathOut);
-        timecalc.SetOutputFile(Form("%s-ChargeCalibStat.txt",(const char*)fRuns->GetRunsAsFileName()));
-    }
 
     if (IsDebug())
@@ -2051 +1995 @@
     
     return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Read the following containers from GetOutputFile()
-// - MCalibrationChargeCam
-// - MCalibrationQECam
-// - MBadPixelsCam
-//
-Bool_t MJCalibration::ReadCalibrationCam()
-{
-  
-  if (IsNoStorage())
-    return kFALSE;
-
-  const TString fname = GetOutputFile();
-  
-  if (gSystem->AccessPathName(fname, kFileExists))
-  {
-      *fLog << err << "Input file " << fname << " doesn't exist." << endl;
-      return kFALSE;
-  }
-
-  *fLog << inf << "Reading from file: " << fname << endl;
-
-  TFile file(fname, "READ");
-  if (fCalibrationCam.Read()<=0)
-  {
-      *fLog << err << "Unable to read MCalibrationChargeCam from " << fname << endl;
-      return kFALSE;
-  }
-
-  if (fQECam.Read()<=0)
-  {
-      *fLog << err << "Unable to read MCalibrationQECam from " << fname << endl;
-      return kFALSE;
-  }
-
-
-  if (file.FindKey("MCalibrationRelTimeCam"))
-      if (fRelTimeCam.Read()<=0)
-      {
-          *fLog << err << "Unable to read MCalibrationRelTimeCam from " << fname << endl;
-          return kFALSE;
-      }
-
-  if (file.FindKey("MBadPixelsCam"))
-  {
-      MBadPixelsCam bad;
-      if (bad.Read()<=0)
-      {
-          *fLog << err << "Unable to read MBadPixelsCam from " << fname << endl;
-          return kFALSE;
-      }
-      fBadPixels.Merge(bad);
-  }
-
-  if (fDisplay /*&& !fDisplay->GetCanvas("Pedestals")*/) // FIXME!
-      fDisplay->Read();
-
-  return kTRUE;
 }
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -161 +161 @@
   MJCalibration(const char *name=NULL, const char *title=NULL);
   
-  const char* GetOutputFile() const;
-  
   MCalibrationIntensityChargeCam  &GetIntensCalibrationCam() { return fIntensCalibCam;   }
   MCalibrationIntensityRelTimeCam &GetIntensRelTimeCam()     { return fIntensRelTimeCam; }
@@ -199 +197 @@
 
   // Precessing
-  Bool_t ReadCalibrationCam();
-  Bool_t ProcessFile(MPedestalCam &pedcam);
   Bool_t Process(MPedestalCam &pedcam);
 

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -354 +354 @@
 }
 
-Bool_t MJCut::ProcessFile(const MDataSet &set)
+Bool_t MJCut::Process(const MDataSet &set)
 {
     if (!set.IsValid())

trunk/MagicSoft/Mars/mjobs/MJCut.h

@@ -43 +43 @@
     ~MJCut();
 
-    Bool_t ProcessFile(const MDataSet &set);
+    Bool_t Process(const MDataSet &set);
 
     void EnableStorageOfSummary(Bool_t b=kTRUE)  { fStoreSummary = b; } // See SetNameSummary

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -148 +148 @@
 }
 
-const char* MJPedestal::GetOutputFile() const
-{
-    const TString name(GetOutputFileName());
-    if (name.IsNull())
-        return "";
-
-    return Form("%s/%s", fPathOut.Data(), name.Data());
-}
-
 const char* MJPedestal::GetOutputFileName() const
 {
-
-  if (fSequence.IsValid())
     return Form("pedest%08d.root", fSequence.GetSequence());
-  
-  if (!fRuns)
-    return "";
-  
-  return Form("%s-F0.root", (const char*)fRuns->GetRunsAsFileName());
-}
-
-//---------------------------------------------------------------------------------
-//
-// Try to read an existing MPedestalCam from a previously created output file. 
-// If found, also an MBadPixelsCam and the corresponding display is read.
-//
-// In case of Storage type "kNoStorage" or if the file is not found or the 
-// MPedestalCam cannot be read, return kFALSE, otherwise kTRUE.
-//
-Bool_t MJPedestal::ReadPedestalCam()
-{
-    const TString fname = GetOutputFile();
-
-    const Bool_t fileexist = !gSystem->AccessPathName(fname, kFileExists);
-    if (!fileexist)
-      {
-        *fLog << inf << "Input file " << fname << " not found, will create pedestals" << endl;
-        return kFALSE;
-      }
-
-    *fLog << inf << "Reading pedestals from file: " << fname << endl;
-
-    TFile file(fname, "READ");
-    if (fPedestalCamIn.Read()<=0)
-    {
-        *fLog << err << "Unable to read incoming MPedestalCam from " << fname << endl;
-        return kFALSE;
-    }
-
-    if (fPedestalCamOut.Read()<=0)
-    {
-        *fLog << err << "Unable to read outgoing MPedestalCam from " << fname << endl;
-        return kFALSE;
-    }
-
-    if (file.FindKey("MBadPixelsCam"))
-    {
-        MBadPixelsCam bad;
-        if (bad.Read()<=0)
-        {
-            *fLog << err << "Unable to read MBadPixelsCam from " << fname << endl;
-            return kFALSE;
-        }
-        fBadPixels.Merge(bad);
-    }
-
-    if (fDisplay && !fDisplay->GetCanvas("Pedestals"))
-        fDisplay->Read();
-
-    return kTRUE;
 }
 
@@ -243 +176 @@
 }
 
-Bool_t MJPedestal::WriteExtractor() const
-{
-
-  const TString name  = Form("pedy%08d.root",fSequence.GetSequence());
-  const TString fname = Form("%s/%s",fPathIn.Data(),name.Data());
-
-  *fLog << inf << "Updating extractor in file: " << fname << endl;
-
-  TFile file(fname, fOverwrite?"RECREATE":"NEW");
-  if (!file.IsOpen())
-    {
-      *fLog << err << dbginf << "ERROR - Could not open file " << fname << endl;
-      *fLog << err << dbginf << "Maybe, file " << fname << " already exists, call callisto with option -f then." << endl;
-      return kFALSE;
-    }
-
-  TObjArray cont;
-  cont.Add(fExtractor);
-
-  return WriteContainer(cont);
-}
-
 //---------------------------------------------------------------------------------
 //
@@ -280 +191 @@
     TString title = fDisplay->GetTitle();
     title += "--  Pedestal ";
-    if (fSequence.IsValid())
-        title += fSequence.GetName();
-    else
-        if (fRuns)  // FIXME: What to do if an environmentfile was used?
-            title += fRuns->GetRunsAsString();
+    title += fSequence.GetName();
     title += "  --";
     fDisplay->SetTitle(title);
@@ -902 +809 @@
     cont.Add(&fBadPixels);
 
-    return WriteContainer(cont, GetOutputFileName(),fOverwrite?"RECREATE":"NEW");
+    return WriteContainer(cont, GetOutputFileName(), fOverwrite?"RECREATE":"NEW");
 }
 
 Bool_t MJPedestal::Process()
 {
-    if (!ReadPedestalCam())
-        return ProcessFile();
-
-    return kTRUE;
-}
-
-Bool_t MJPedestal::ProcessFile()
-{
     if (!fSequence.IsValid())
     {
-        if (!fRuns)
-        {
-            *fLog << err << "Neither AddRuns nor SetSequence nor SetEnv was called... abort." << endl;
-            return kFALSE;
-        }
-        if (fRuns && fRuns->GetNumRuns() != fRuns->GetNumEntries())
-        {
-            *fLog << err << "Number of files found doesn't match number of runs... abort."
-                << fRuns->GetNumRuns() << " vs. " << fRuns->GetNumEntries() << endl;
-            return kFALSE;
-        }
-    }
+          *fLog << err << "ERROR - Sequence invalid..." << endl;
+          return kFALSE;
+    }
+
+    *fLog << inf;
+    fLog->Separator(GetDescriptor());
+    *fLog << "Calculate pedestal from Sequence #";
+    *fLog << fSequence.GetSequence() << endl << endl;
 
     if (!CheckEnv())
@@ -940 +835 @@
     fLog->Separator(GetDescriptor());
     *fLog << "Calculate MPedestalCam from " << type << "-runs ";
-    if (fSequence.IsValid())
-        *fLog << fSequence.GetName() << endl;
-    else
-        if (fRuns)
-            *fLog << fRuns->GetRunsAsString() << endl;
-        else
-            *fLog << "in Resource File." << endl;
+    *fLog << fSequence.GetName() << endl;
     *fLog << endl;
 
@@ -987 +876 @@
     if (IsUseRawData())
     {
-        if (fRuns || fSequence.IsValid())
-            rawread.AddFiles(fSequence.IsValid() ? iter : *fRuns);
+        rawread.AddFiles(iter);
         tlist.AddToList(&rawread);
     }
@@ -994 +882 @@
     {
         read.DisableAutoScheme();
-        if (fRuns || fSequence.IsValid())
-          read.AddFiles(fSequence.IsValid() ? iter : *fRuns);
+        read.AddFiles(iter);
         tlist.AddToList(&read);
     }

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -99 +99 @@
     const MBadPixelsCam &GetBadPixels() const { return fBadPixels;   }
 
-    const char*  GetOutputFile() const;
-
     //    const MHPedestalCam &GetPedestalHist() const { return fPedestalHist;  }
 
     const Bool_t IsUseData() const { return fExtractType == kUseData; }
 
-    Bool_t Process    ();
-    Bool_t ProcessFile();
+    Bool_t Process();
 
     void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }