Changeset 8582 for trunk/MagicSoft/Mars/mjobs

Timestamp:

06/19/07 10:35:33 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (4 diffs)
• MJCalibration.cc (modified) (1 diff)
• MJCut.cc (modified) (1 diff)
• MJPedestal.cc (modified) (1 diff)
• MJSpectrum.cc (modified) (1 diff)
• MJStar.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -151 +151 @@
     // file always. Which might make the usage outside of
     // callisto difficult.
+    TObjArray cont;
+    cont.Add(const_cast<TEnv*>(GetEnv()));
+
+    if (fDisplay)
+        cont.Add(fDisplay);
+
     const TString name(Form("signal%08d.root", fSequence.GetSequence()));
-    return WriteDisplay(name, "UPDATE");
+    return WriteContainer(cont, name, "UPDATE");
 }
 
@@ -675 +681 @@
     writemc.AddContainer("MMcEvtBasic", "OriginalMC");
 
+    // Write the special calib tree
+    /*
+    MWriteRootFile writecal(2, fname, fOverwrite?"RECREATE":"NEW");
+    writecal.SetName("WriteCalib");
+    writecal.AddContainer("MBadPixelsCam",          "Calib");
+    writecal.AddContainer("MCalibrationChargeCam",  "Calib");
+    writecal.AddContainer("MCalibrationRelTimeCam", "Calib");
+    */
+
     // Now setup tasklist for events
     MTaskList tlist2;
@@ -722 +737 @@
         if (fIsRelTimesUpdate)
             tlist3.AddToList(&recalc); // MCalibrationRelTimeCam
-    }  
+
+        //tlist3.AddToList(&writecal);   // MWriteRootFile
+    }
 
     // Continue for all non-cosmic events
@@ -761 +778 @@
     //    tlist2.AddToList(&fill7);
     tlist2.AddToList(&fill9);
-    tlist2.AddToList(&fillB);
-    tlist2.AddToList(&fillD);
+    if (!fSequence.IsMonteCarlo())
+    {
+        tlist2.AddToList(&fillB);
+        tlist2.AddToList(&fillD);
+    }
     if (extractor1->HasLoGain())
     {

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -2027 +2027 @@
         cont.Add(fDisplay);
 
+    cont.Add(const_cast<TEnv*>(GetEnv()));
+
     return WriteContainer(cont, GetOutputFileName(), "UPDATE");
 }

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -319 +319 @@
     if (fDisplay)
         arr.Add(fDisplay);
+
+    arr.Add(const_cast<TEnv*>(GetEnv()));
 
     return WriteContainer(arr, fname, "UPDATE");

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -895 +895 @@
         return kFALSE;
 
-    *fLog << all << "Mean pulse time (" << (fSequence.IsMonteCarlo()?"MC":"cosmics") << "): ";
+    *fLog << all << "Mean pulse time/Avg pos.of maximum (" << (fSequence.IsMonteCarlo()?"MC":"cosmics") << "): ";
     *fLog << meanpulsetime << "+-" << rmspulsetime << endl;
 

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -1322 +1322 @@
 
     // check if output should be written
-    if (!fPathOut.IsNull())
-        fDisplay->SaveAsRoot(fPathOut);
-
-    return kTRUE;
-}
+    if (fPathOut.IsNull())
+        return kTRUE;
+
+    // Write the output
+    TObjArray cont;
+    cont.Add((TObject*)GetEnv());
+
+    if (fDisplay)
+        cont.Add(fDisplay);
+
+    return WriteContainer(cont, fPathOut, "RECREATE");
+}

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -103 +103 @@
     }
 
+    TObjArray cont;
+    cont.Add(const_cast<TEnv*>(GetEnv()));
+
+    if (fDisplay)
+        cont.Add(fDisplay);
+
     const TString oname = Form("%s/star%08d.root", (const char*)fPathOut, fSequence.GetSequence());
-
-    *fLog << inf << "Writing to file: " << oname << endl;
-
-    TFile file(oname, "RECREATE");
-
-    *fLog << inf << " - MStatusDisplay..." << flush;
-    if (fDisplay && fDisplay->Write()<=0)
-    {
-        *fLog << err << "Unable to write MStatusDisplay to " << oname << endl;
-        return kFALSE;
-    }
-    *fLog << inf << "ok." << endl;
-
-    return kTRUE;
+    return WriteContainer(cont, oname, "UPDATE");
 }
 
@@ -345 +338 @@
     // Spark cut
     MFDataPhrase fsparks("log10(MNewImagePar.fConc1) < (-0.371)*log10(MHillas.fSize) + 0.596", "SparkCut");
+    //fill0b.SetFilter(&fsparks);
     fill0c.SetFilter(&fsparks);