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

Timestamp:

08/12/04 16:41:37 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -44 +44 @@
 #include "MLogManip.h"
 
+#include "MTaskEnv.h"
+#include "MSequence.h"
 #include "MRunIter.h"
 #include "MParList.h"
@@ -86 +88 @@
 //
 MJPedestal::MJPedestal(const char *name, const char *title) 
-    : fEnv(0), fRuns(0), fExtractor(NULL), fDisplayType(kNormalDisplay),
+    : fEnv(0), fRuns(0), fSequence(0), fExtractor(NULL), fDisplayType(kNormalDisplay),
       fDataCheck(kFALSE)
 {
@@ -101 +103 @@
 const char* MJPedestal::GetOutputFile() const
 {
+    if (fSequence)
+        return Form("%s/calped%05d", (const char*)fOutputPath, fSequence->GetSequence());
+
     if (!fRuns)
         return "";
@@ -143 +148 @@
 }
 
-
 void MJPedestal::DisplayResult(MParList &plist)
 {
@@ -154 +158 @@
     TString title = fDisplay->GetTitle();
     title += "--  Pedestal ";
-    if (fRuns)  // FIXME: What to do if an environmentfile was used?
-        title += fRuns->GetRunsAsString();
+    if (fSequence)
+        title += fSequence->GetName();
+    else
+        if (fRuns)  // FIXME: What to do if an environmentfile was used?
+            title += fRuns->GetRunsAsString();
     title += "  --";
     fDisplay->SetTitle(title);
@@ -242 +249 @@
     c3.cd(6);
     gPad->SetBorderMode(0);
-    gPad->SetTicks();
-
-    TArrayI inner(1);
-    inner[0] = 0;
-
-    TArrayI outer(1);
-    outer[0] = 1;
 
     if (geomcam.InheritsFrom("MGeomCamMagic"))
     {
+        TArrayI inner(1);
+        inner[0] = 0;
+
+        TArrayI outer(1);
+        outer[0] = 1;
+
         TArrayI s0(6);
         s0[0] = 6;
@@ -270 +276 @@
         s2[2] = 5;
 
-        gPad->Clear();
         TVirtualPad *pad = gPad;
         pad->Divide(2,1);
@@ -278 +283 @@
         inout[1] = disp1.ProjectionS(s0, outer, "Outer");
 
-        inout[0]->SetDirectory(NULL);
-        inout[1]->SetDirectory(NULL);
-
         for (int i=0; i<2; i++)
         {
-            TLegend *leg2 = new TLegend(0.6,0.2,0.9,0.55);
-            leg2->SetHeader(inout[i]->GetName());
             pad->cd(i+1);
+            gPad->SetBorderMode(0);
+            gPad->SetTicks();
+
+            inout[i]->SetDirectory(NULL);
             inout[i]->SetLineColor(kRed+i);
             inout[i]->SetBit(kCanDelete);
             inout[i]->Draw();
-            inout[i]->Fit("gaus","Q");
-            leg2->AddEntry(inout[i],inout[i]->GetName(),"l");
+            inout[i]->Fit("gaus", "Q");
+
+            TLegend *leg2 = new TLegend(0.6,0.2,0.9,0.55);
+            leg2->SetHeader(inout[i]->GetName());
+            leg2->AddEntry(inout[i], inout[i]->GetName(), "l");
 
             //
@@ -310 +317 @@
                 half[j]->SetBit(kCanDelete);
                 half[j]->Draw("same");
-                leg2->AddEntry(half[j],half[j]->GetName(),"l");
+                leg2->AddEntry(half[j], half[j]->GetName(), "l");
             }
             leg2->Draw();
@@ -419 +426 @@
 Bool_t MJPedestal::ProcessFile()
 {
-    if (!fRuns && !fEnv)
-    {
-        *fLog << err << "Neither AddRuns was called nor SetEnv was used... abort." << endl;
-        return kFALSE;
-    }
-    if (fRuns && fRuns->GetNumRuns() != fRuns->GetNumEntries())
+    if (!fRuns && !fEnv && !fSequence)
+    {
+        *fLog << err << "Neither AddRuns nor SetSequence nor SetEnv was called... abort." << endl;
+        return kFALSE;
+    }
+    if (!fSequence && fRuns && fRuns->GetNumRuns() != fRuns->GetNumEntries())
     {
         *fLog << err << "Number of files found doesn't match number of runs... abort." << endl;
@@ -433 +440 @@
     fLog->Separator(GetDescriptor());
     *fLog << "Calculate MPedestalCam from Runs ";
-    if (fRuns)
-        *fLog << fRuns->GetRunsAsString() << endl;
+    if (fSequence)
+        *fLog << fSequence->GetName() << endl;
     else
-        *fLog << "in " << fEnv->GetName() << endl;
+        if (fRuns)
+            *fLog << fRuns->GetRunsAsString() << endl;
+        else
+            *fLog << "in " << fEnv->GetName() << endl;
     *fLog << endl;
 
@@ -446 +456 @@
     MRawFileRead rawread(NULL);
 
+    MDirIter iter;
+    if (fSequence)
+        fSequence->SetupPedRuns(iter);
+
     if (fDataCheck)
     {
-        if (fRuns)
-            rawread.AddFiles(*fRuns);
-        tlist.AddToList(&rawread);
+        if (fRuns || fSequence)
+            rawread.AddFiles(fSequence ? iter : *fRuns);
+        tlist.AddToList(&rawread);
     }
     else
     {
         read.DisableAutoScheme();
-        if (fRuns)
-            static_cast<MRead&>(read).AddFiles(*fRuns);
+        if (fRuns || fSequence)
+            static_cast<MRead&>(read).AddFiles(fSequence ? iter : *fRuns);
         tlist.AddToList(&read);
     }
@@ -468 +482 @@
     MGeomApply      geomapl;
     MBadPixelsMerge merge(&fBadPixels);
+
     MPedCalcPedRun  pedcalc;
+
+    MTaskEnv taskenv("ExtractPedestal");
+    taskenv.SetDefault(&pedcalc);
 
     if (fExtractor)
@@ -483 +501 @@
     tlist.AddToList(&geomapl);
     tlist.AddToList(&merge);
-    tlist.AddToList(&pedcalc);
+    tlist.AddToList(&taskenv);
 
     //