Changeset 9441 for trunk/MagicSoft/Mars/mjobs

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJSimulation.cc (modified) (13 diffs)
• MJSimulation.h (modified) (3 diffs)
• MSequence.cc (modified) (6 diffs)
• MSequence.h (modified) (4 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;
 

trunk/MagicSoft/Mars/mjobs/MJSimulation.h

@@ -9 +9 @@
 class MArgs;
 class MParList;
+class MSequence;
 class MWriteRootFile;
 
 class MJSimulation : public MJob
 {
+public:
+    enum Mode_t { kModeData, kModePed, kModeCal, kModePointRun };
+
 private:
     Bool_t fForceMode;      // Force execution even if RUNE-section was not foundm
@@ -19 +23 @@
     Bool_t fForceTrigger;   // Force the use of the trigger "electronics"
 
-    Bool_t WriteResult(const MParList &plist);
+    Int_t fOperationMode;   // Operation mode (data, ped, cal, pointrun)
+
+    Bool_t WriteResult(const MParList &plist, const MSequence &seq);
     Bool_t CheckEnvLocal();
 
@@ -30 +36 @@
     void SetForceMode(Bool_t force=kTRUE) { fForceMode = force; }
 
+    void SetMode(Int_t mode) { fOperationMode = mode; }
+
     // Process
-    Bool_t Process(const MArgs &args);
+    Bool_t Process(const MArgs &args, const MSequence &seq);
 
     ClassDef(MJSimulation, 0) // Job to run the simulation (ceres)

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -447 +447 @@
 TString MSequence::InflateFileName(const MTime &night, UShort_t tel, Int_t run, Int_t file, Int_t type)
 {
+    if (!night && type==kCorsika)
+        return MString::Format("cer%06d", -run);
+
     const char *id="_";
     switch ((RunType_t)(type&kRunType))
@@ -711 +714 @@
     const TArrayI *r=0, *f=0;
     GetArrays(r, f, type);
-    return GetRuns(iter, *r, *f, type, path);
+    return r==0 ? 0 : GetRuns(iter, *r, *f, type, path);
 }
 
@@ -859 +862 @@
     const Bool_t rc = !fDataPath.IsNull() && gSystem->AccessPathName(fDataPath, kFileExists);
     if (rc)
-        gLog << err << "ERROR - Directory '" << path << "' doesn't exist." << endl;
+        gLog << err << "ERROR - Directory '" << fDataPath << "' doesn't exist." << endl;
 
     return !rc;
@@ -942 +945 @@
 //
 MSequence::MSequence(const char *fname, const char *path, UInt_t seq)
-{
+   : fTelescope(1), fSequence((UInt_t)-1), fLastRun((UInt_t)-1),
+     fNumEvents((UInt_t)-1), fPeriod((UInt_t)-1), fLightCondition(kNA),
+     fMonteCarlo(kFALSE)
+{
+    fName  = "MSequence";
+    fTitle = "Sequence file";
+
+    if (TString(fname).IsNull() && TString(path).IsNull() && seq==(UInt_t)-1)
+        return;
+
     // regular expression to distinguish beween a mysql-path and
     // a filename from where the sequence should be retrieved
@@ -951 +963 @@
     const Bool_t rc1 = db.IsNull() ? ReadFile(fname, seq) : ReadDatabase(fname, seq);
     const Bool_t rc2 = SetDataPath(path);
-
-    fName  = "MSequence";
-    fTitle = "Sequence file";
 
     if (!rc1 || !rc2)
@@ -1353 +1362 @@
         out << pre << "Night:          " << fNight.GetStringFmt("%Y-%m-%d") << endl;
     out << endl;
-    out << pre << "LightCondition: ";
-    switch (fLightCondition)
-    {
-    case kNA:       out << "n/a" << endl;      break;
-    case kNoMoon:   out << "NoMoon" << endl;   break;
-    case kTwilight: out << "Twilight" << endl; break;
-    case kMoon:     out << "Moon" << endl;     break;
-    case kDay:      out << "Day" << endl;      break;
+    if (fLightCondition!=kNA)
+    {
+        out << pre << "LightCondition: ";
+        switch (fLightCondition)
+        {
+        case kNA:       out << "n/a" << endl;      break;
+        case kNoMoon:   out << "NoMoon" << endl;   break;
+        case kTwilight: out << "Twilight" << endl; break;
+        case kMoon:     out << "Moon" << endl;     break;
+        case kDay:      out << "Day" << endl;      break;
+        }
     }
 
     if (fStart!=MTime())
         out << pre << "Start:          " << fStart.GetSqlDateTime() << endl;
-    if (fLastRun>=0)
+    if (fLastRun!=(UInt_t)-1)
         out << pre << "LastRun:        " << fLastRun << endl;
-    if (fNumEvents>=0)
+    if (fNumEvents!=(UInt_t)-1)
         out << pre << "NumEvents:      " << fNumEvents << endl;
     if (!fProject.IsNull())

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -23 +23 @@
         kRoot  =BIT(1),
         kReport=BIT(2),
+        kCer   =BIT(3),  // Corsika files
     };
     enum RunType_t {
-        kPed   =BIT(3),
-        kCal   =BIT(4),
-        kDat   =BIT(5),
-        kExcl  =BIT(6),
+        kPed   =BIT(4),  // Don't use overlapping bits!
+        kCal   =BIT(5),
+        kDat   =BIT(6),
+        kExcl  =BIT(7),
         kAll   =kPed|kDat|kCal,
-        kImage =BIT(7),
-        kCalib =BIT(8)
+        kImage =BIT(8),
+        kCalib =BIT(9)
     };
 
     enum { kRunType   = kPed|kCal|kDat|kImage|kCalib };
-    enum { kFileType  = kRaw|kRoot|kReport };
+    enum { kFileType  = kRaw|kRoot|kReport|kCer };
     enum { kFilePaths = kFileType|kImage|kCalib };
 
@@ -53 +54 @@
         kCalibrated = kRoot  |kCalib,
         kImages     = kRoot  |kImage,
+        kCorsika    = kCer   |kDat,
     };
 
@@ -131 +133 @@
 
 public:
+/*
     MSequence() : fTelescope(1), fSequence((UInt_t)-1), fLastRun((UInt_t)-1),
         fNumEvents((UInt_t)-1), fPeriod((UInt_t)-1), fLightCondition(kNA), fMonteCarlo(kFALSE)
@@ -137 +140 @@
         fTitle = "Sequence file";
     }
-    MSequence(const char *fname, const char *path="", UInt_t id=(UInt_t)-1);
+    */
+    MSequence(const char *fname=0, const char *path=0, UInt_t id=(UInt_t)-1);
     MSequence(const char *fname, UInt_t seq, UShort_t tel=0);
     MSequence(const MSequence &s) : MParContainer(s),