Changeset 9441 for trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

Timestamp:

05/10/09 11:52:17 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJSimulation.cc (modified) (13 diffs)

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -62 +62 @@
 
 #include "MArgs.h"
-//#include "MDirIter.h"
+#include "MDirIter.h"
 #include "MParList.h"
 #include "MTaskList.h"
@@ -126 +126 @@
 //
 MJSimulation::MJSimulation(const char *name, const char *title)
-    : fForceMode(kFALSE), fCamera(kTRUE) ,fForceTrigger(kFALSE)
+    : fForceMode(kFALSE), fCamera(kTRUE), fForceTrigger(kFALSE),
+    fOperationMode(kModeData)
 {
     fName  = name  ? name  : "MJSimulation";
@@ -140 +141 @@
     return kTRUE;
 }
-
-Bool_t MJSimulation::WriteResult(const MParList &plist)
+/*
+TString MJSimulation::GetOutFile(const MSequence &seq) const
+{
+    return seq.IsValid() ? Form("ceres%08d.root", seq.GetSequence()) : "ceres.root";
+}
+*/
+
+Bool_t MJSimulation::WriteResult(const MParList &plist, const MSequence &seq)
 {
     if (fPathOut.IsNull())
@@ -151 +158 @@
     TObjArray cont;
     cont.Add(const_cast<TEnv*>(GetEnv()));
-    //cont.Add(const_cast<MSequence*>(&fSequence));
+    if (seq.IsValid())
+        cont.Add(const_cast<MSequence*>(&seq));
 
     cont.Add(plist.FindObject("PulseShape"));
@@ -160 +168 @@
     if (fDisplay)
     {
-//        TString title = "--  Reflector: ";
-//        title += fSequence.GetSequence();
-//        title += "  --";
-//        fDisplay->SetTitle(title, kFALSE);
+        TString title = "--  Ceres";
+        if (seq.IsValid())
+        {
+            title += ": ";
+            title += seq.GetSequence();
+        }
+        title += "  --";
         fDisplay->SetTitle("Ceres", kFALSE);
 
@@ -169 +180 @@
     }
 
-//    const TString oname = Form("reflector%08d.root", fSequence.GetSequence());
-    const TString oname = "ceres.root";
-    return WriteContainer(cont, oname, "RECREATE");
+    const TString name = seq.IsValid() ? Form("ceres%08d.root", seq.GetSequence()) : "ceres.root";
+    return WriteContainer(cont, name, "RECREATE");
 }
 
@@ -235 +245 @@
 }
 
-Bool_t MJSimulation::Process(const MArgs &args)
+Bool_t MJSimulation::Process(const MArgs &args, const MSequence &seq)
 {
     /*
@@ -245 +255 @@
     */
 
-    //if (!HasWritePermission(GetPathOut()))
-    //    return kFALSE;
+//    if (!HasWritePermission(CombinePath(fPathOut, GetOutFile(seq))))
+//        return kFALSE;
 
     *fLog << inf;
@@ -254 +264 @@
         return kFALSE;
 
-    *fLog << warn << "FIXME: Monte Carlo simulation: Sequences not supported yet.";
-    //*fLog << fSequence.GetFileName() << endl;
+    if (seq.IsValid())
+        *fLog << fSequence.GetFileName() << endl;
+    else
+        *fLog << args.GetNumArguments() << "-files" << endl;
     *fLog << endl;
 
+    MDirIter iter;
+    if (seq.IsValid() && seq.GetRuns(iter, MSequence::kCorsika)<=0)
+    {
+        *fLog << err << "ERROR - Sequence valid but without files." << endl;
+        return kFALSE;
+    }
+
     // --------------------------------------------------------------------------------
-
-    //MDirIter iter;
-    //if (fSequence.GetRuns(iter, MSequence::kCalibrated)<=0)
-    //    return kFALSE;
 
     // Setup Parlist
@@ -297 +312 @@
     //header.InitFadcType(3);
 
-    header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTData);
-    if (args.GetNumArguments()==1)
-    {
-        if (!args.GetArgumentStr(0).CompareTo("pedestal", TString::kIgnoreCase))
-        {
-            header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTPedestal);
-            header.SetSourceInfo("Pedestal");
-        }
-        if (!args.GetArgumentStr(0).CompareTo("calibration", TString::kIgnoreCase))
-        {
-            header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTCalibration);
-            header.SetSourceInfo("Calibration");
-        }
-        if (!args.GetArgumentStr(0).CompareTo("pointrun", TString::kIgnoreCase))
-            header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTPointRun);
+    switch (fOperationMode)
+    {
+    case kModeData:
+        header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTData);
+        break;
+
+    case kModePed:
+        header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTPedestal);
+        header.SetSourceInfo("Pedestal");
+        break;
+
+    case kModeCal:
+        header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTCalibration);
+        header.SetSourceInfo("Calibration");
+        break;
+
+    case kModePointRun:
+        header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTPointRun);
+        break;
     }
 
@@ -333 +352 @@
     read.SetForceMode(fForceMode);
 
-    for (int i=0; i<args.GetNumArguments(); i++)
-        read.AddFile(args.GetArgumentStr(i));
+    if (!seq.IsValid())
+    {
+        for (int i=0; i<args.GetNumArguments(); i++)
+            read.AddFile(args.GetArgumentStr(i));
+    }
+    else
+        read.AddFiles(iter);
 
     MSimMMCS simmmcs;
@@ -366 +390 @@
     // -------------------------------------------------------------------
 
-    MBinning binse( 100,     1,   100000, "BinningEnergy",    "log");
-    MBinning binsth( 70,   0.9,   900000, "BinningThreshold", "log");
-    MBinning binsee( 35,   0.9,   900000, "BinningEnergyEst", "log");
+    MBinning binse( 120,     1,  1000000, "BinningEnergy",    "log");
+    MBinning binsth( 60,   0.9,   900000, "BinningThreshold", "log");
+    MBinning binsee( 36,   0.9,   900000, "BinningEnergyEst", "log");
     MBinning binss( 100,     1, 10000000, "BinningSize",      "log");
 //    MBinning binsi( 100,  -500,      500, "BinningImpact");
-    MBinning binsi(  55,     0,     1100, "BinningImpact");
+    MBinning binsi(  32,     0,      800, "BinningImpact");
     MBinning binsh( 150,     0,       50, "BinningHeight");
     MBinning binsaz(720,  -360,      360, "BinningAz");
     MBinning binszd( 70,     0,       70, "BinningZd");
-    MBinning binsvc( 45,     0,        9, "BinningViewCone");
+    MBinning binsvc( 35,     0,        7, "BinningViewCone");
     MBinning binsel(150,     0,       50, "BinningTotLength");
     MBinning binsew(150,     0,       15, "BinningMedLength");
@@ -845 +869 @@
     //-------------------------------------------
 
-    if (!WriteResult(plist))
+    if (!WriteResult(plist, seq))
         return kFALSE;