Changeset 6466 for trunk/MagicSoft/Mars/mjobs

Timestamp:

02/14/05 19:29:41 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalib.h (modified) (1 diff)
• MJCalibrateSignal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalib.h

@@ -31 +31 @@
     void SetInput(MRunIter *iter) { fRuns = iter; }
 
+    Byte_t GetDataFlag() const { return fDataFlag; }
+
     Bool_t IsUseRawData()  const { return fDataFlag==kIsUseRawData;  }
     Bool_t IsUseRootData() const { return fDataFlag==kIsUseRootData; }

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -352 +352 @@
     readreal.AddTree("Currents");
 
-    //MReadMarsFile read("Events");
-    //read.DisableAutoScheme();
+    MReadMarsFile readmc("Events");
+    readmc.DisableAutoScheme();
+
     MRawFileRead rawread(NULL);
-    if (IsUseRawData())
+
+    switch (GetDataFlag())
+    {
+    case kIsUseRawData:
         rawread.AddFiles(fSequence.IsValid() ? iter : *fRuns);
-    else
+        break;
+    case kIsUseMC:
+        readmc.AddFiles(fSequence.IsValid() ? iter : *fRuns);
+        break;
+    case kIsUseRootData:
         readreal.AddFiles(fSequence.IsValid() ? iter : *fRuns);
+        break;
+    }
 
     MPointingPosInterpolate pextr;
@@ -672 +682 @@
 
     // Now setup main tasklist
-    tlist.AddToList(IsUseRawData() ? (MTask*)&rawread : (MTask*)&readreal);
+    switch (GetDataFlag())
+    {
+    case kIsUseRawData:
+        tlist.AddToList(&rawread);
+        break;
+    case kIsUseMC:
+        tlist.AddToList(&readmc);
+        break;
+    case kIsUseRootData:
+        tlist.AddToList(&readreal);
+        break;
+    }
+    //tlist.AddToList(IsUseRawData() ? (MTask*)&rawread : (MTask*)&readreal);
     if (IsUseRootData())
       tlist2.AddToList(&pextr);