Changeset 8964 for trunk/MagicSoft/Mars/mjobs

Timestamp:

06/16/08 01:49:34 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -187 +187 @@
     readreal.AddTree("Currents",         MReadReports::kRequired);
     readreal.AddTree("CC");
+    readreal.AddTree("Rec");
     readreal.AddTree("Trigger");
     readreal.AddTree("Pyrometer");
@@ -263 +264 @@
     fsum.DenySumTrigger();
     fsum.AllowTriggerLvl1();
+    //fsum.RequireTriggerLvl1();
     fill9.SetFilter(&fsum);
 
@@ -481 +483 @@
 
     // instantiate camera histogram containers
-    MHCamEvent evtdt(0, "DT", "Discriminator Threshold;;DT [au]");
+    MHCamEvent evtdt(0, "Thresholds", "Average Discriminator Thresholds;;DT [au]");
+    plist.AddToList(&evtdt);
 
     // instantiate fill tasks
-    MFillH filldt(&evtdt, "MCameraTH", "FillDT");
+    MFillH filldt1("Thresholds", "MCameraTH", "FillDT-CC");
+    MFillH filldt2("Thresholds", "MCameraTH", "FillDT-Rec");
+    filldt1.SetNameTab("DT");
+    filldt2.SetBit(MFillH::kDoNotDisplay);
+    filldt2.SetBit(MFillH::kCanSkip);
 
     MHSectorVsTime histipr;
@@ -515 +522 @@
         tlist.AddToList(&filldc,  "Currents");
         tlist.AddToList(&fillipr, "Trigger");
-        tlist.AddToList(&filldt,  "CC");
+        tlist.AddToList(&filldt1, "CC");   // Old files: Receiver information in CC-Tree  (Mars<=2.0)
+        tlist.AddToList(&filldt2, "Rec");  // New files: Receiver information in Rec-Tree (Mars >2.0)
     }
     if (!HasNullOut())