Changeset 6500 for trunk/MagicSoft/Mars/mjobs

Timestamp:

02/15/05 18:44:43 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (3 diffs)
• MJStar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -357 +357 @@
     MRawFileRead rawread(NULL);
 
+    MRead *read = 0;
     switch (GetDataFlag())
     {
-    case kIsUseRawData:
-        rawread.AddFiles(fSequence.IsValid() ? iter : *fRuns);
-        break;
-    case kIsUseMC:
-        readmc.AddFiles(fSequence.IsValid() ? iter : *fRuns);
-        break;
-    case kIsUseRootData:
-        readreal.AddFiles(fSequence.IsValid() ? iter : *fRuns);
-        break;
-    }
+    case kIsUseRawData:  read = &rawread;  break;
+    case kIsUseMC:       read = &readmc;   break;
+    case kIsUseRootData: read = &readreal; break;
+    }
+    read->AddFiles(fSequence.IsValid() ? iter : *fRuns);
+
+    const TString fname(Form("%s{s/_D_/_Y_}{s/.raw$/.root}", fPathOut.Data()));
+
+    // Write the special MC tree
+    MWriteRootFile writemc(2, fname, fOverwrite?"RECREATE":"NEW");
+    writemc.SetName("WriteMC");
+    writemc.AddContainer("MMcEvtBasic", "MonteCarlo");
+
+    // Skips empty MC events (Not necessary, but faster!)
+    MContinue contmc("MRawEvtData.GetNumPixels<0.5", "ContEmptyMC");
 
     MPointingPosInterpolate pextr;
@@ -563 +569 @@
 
     // The second rule is for the case reading raw-files!
-    MWriteRootFile write(2, Form("%s{s/_D_/_Y_}{s/.raw$/.root}", fPathOut.Data()), fOverwrite?"RECREATE":"NEW");
+    MWriteRootFile write(2, fname, fOverwrite?"RECREATE":"NEW");
     // Run Header
     write.AddContainer("MRawRunHeader",             "RunHeaders");
@@ -682 +688 @@
 
     // Now setup main tasklist
-    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);
+    tlist.AddToList(read);
+    if (IsUseMC())
+        tlist.AddToList(&writemc);
+    tlist.AddToList(&contmc);
+
     if (IsUseRootData())
       tlist2.AddToList(&pextr);

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -273 +273 @@
         write.AddContainer("MMcConfigRunHeader",   "RunHeaders");
         write.AddContainer("MMcCorsikaRunHeader",  "RunHeaders");
+        write.AddCopySource("MonteCarlo");
     }
     else