Changeset 8434 for trunk/MagicSoft/Mars/mjobs/MJStar.cc

Timestamp:

04/23/07 20:11:25 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJStar.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -119 +119 @@
 }
 
-Bool_t MJStar::Process(Bool_t ismc)
+Bool_t MJStar::Process()
 {
     if (!fSequence.IsValid())
@@ -275 +275 @@
     write.AddContainer("MMuonSetup",                "RunHeaders");
 
-    if (ismc)
+    if (fSequence.IsMonteCarlo())
     {
         // Monte Carlo Data
@@ -311 +311 @@
     writem.AddContainer("MRawEvtHeader",            "Muons");
     writem.AddContainer("MPointingPos",             "Muons");
-    if (ismc)
+    if (fSequence.IsMonteCarlo())
     {
         // Monte Carlo Data
@@ -318 +318 @@
     }
 
-    if (ismc)
+    if (fSequence.IsMonteCarlo())
         if (fMuonAnalysis)
             writem.AddCopySource("OriginalMC");
@@ -326 +326 @@
     MTaskList tlist2("Events");
     tlist2.AddToList(&apply);
-    if (!ismc)
+    if (!fSequence.IsMonteCarlo())
         tlist2.AddToList(&cont);
     tlist2.AddToList(&contsw);
-    if (!ismc)
+    if (!fSequence.IsMonteCarlo())
     {
         // Calibration events don't enter star at all.
@@ -450 +450 @@
     // ------------------------------------------------------------
 
-    tlist.AddToList(ismc ? (MTask*)&readmc : (MTask*)&readreal);
-    tlist.AddToList(&pcalc,  ismc ? "Events" : "Drive");
+    tlist.AddToList(fSequence.IsMonteCarlo() ? (MTask*)&readmc : (MTask*)&readreal);
+    tlist.AddToList(&pcalc,  fSequence.IsMonteCarlo() ? "Events" : "Drive");
     //tlist.AddToList(&filltst, "Events");
     tlist.AddToList(&tlist2, "Events");
-    if (!ismc)
+    if (!fSequence.IsMonteCarlo())
     {
         // initiate task list