Changeset 8933 for trunk/MagicSoft/Mars/mjobs

Timestamp:

06/10/08 12:07:51 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

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

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -707 +707 @@
     write.AddContainer("MTriggerPattern",           "Events");
 
+    // Trees with slow-control information (obsolete
+    //  if we don't read merpped root-files)
+    write.AddTree("Trigger",    kFALSE);
+    write.AddTree("Drive",      kFALSE);
+    write.AddTree("CC",         kFALSE);
+    write.AddTree("Pyrometer",  kFALSE);
+    write.AddTree("Currents",   kFALSE);
+    write.AddTree("Camera",     kFALSE);
     // Slow-Control: Current-tree
-    write.AddContainer("MTimeCurrents",             "Currents",   kFALSE);
-    write.AddContainer("MCameraDC",                 "Currents",   kFALSE);
-    write.AddContainer("MReportCurrents",           "Currents",   kFALSE);
+    write.AddContainer("MCameraDC",          "Currents",   kFALSE);
     // Slow-Control: Camera-tree
-    write.AddContainer("MReportCamera",             "Camera",     kFALSE);
-    write.AddContainer("MTimeCamera",               "Camera",     kFALSE);
-    write.AddContainer("MCameraAUX",                "Camera",     kFALSE);
-    write.AddContainer("MCameraCalibration",        "Camera",     kFALSE);
-    write.AddContainer("MCameraCooling",            "Camera",     kFALSE);
-    write.AddContainer("MCameraHV",                 "Camera",     kFALSE);
-    write.AddContainer("MCameraLV",                 "Camera",     kFALSE);
-    write.AddContainer("MCameraLids",               "Camera",     kFALSE);
-    // Slow-Control: Trigger-tree
-    write.AddContainer("MReportTrigger",            "Trigger",    kFALSE);
-    write.AddContainer("MTimeTrigger",              "Trigger",    kFALSE);
-    // Slow-Control: Drive-tree
-    write.AddContainer("MReportDrive",              "Drive",      kFALSE);
-    write.AddContainer("MTimeDrive",                "Drive",      kFALSE);
-    // Slow-Control: Central Control-tree
-    write.AddContainer("MReportCC",                 "CC",         kFALSE);
-    write.AddContainer("MTimeCC",                   "CC",         kFALSE);
+    write.AddContainer("MCameraAUX",         "Camera",     kFALSE);
+    write.AddContainer("MCameraCalibration", "Camera",     kFALSE);
+    write.AddContainer("MCameraCooling",     "Camera",     kFALSE);
+    write.AddContainer("MCameraHV",          "Camera",     kFALSE);
+    write.AddContainer("MCameraLV",          "Camera",     kFALSE);
+    write.AddContainer("MCameraLids",        "Camera",     kFALSE);
 
     // Write the special MC tree

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -188 +188 @@
     readreal.AddTree("CC");
     readreal.AddTree("Trigger");
+    readreal.AddTree("Pyrometer");
     readreal.AddFiles(iter);
 
@@ -330 +331 @@
     else
     {
-        write.AddContainer("MTime",                 "Events");
-        // Drive
-        write.AddContainer("MReportDrive",          "Drive");
-        write.AddContainer("MTimeDrive",            "Drive");
-        // Starguider
-        write.AddContainer("MReportStarguider",     "Starguider", kFALSE);
-        write.AddContainer("MTimeStarguider",       "Starguider", kFALSE);
-        // Effective On Time
-        writet.AddContainer("MEffectiveOnTime",     "EffectiveOnTime");
-        writet.AddContainer("MTimeEffectiveOnTime", "EffectiveOnTime");
+        // Event time
+        write.AddContainer("MTime", "Events");
+
+        // Slow-control trees with time information
+        write.AddTree("Drive");
+        write.AddTree("Starguider", kFALSE);
+        write.AddTree("Pyrometer",  kFALSE);
+        writet.AddTree("EffectiveOnTime");
     }