Changeset 8933 for trunk

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (2 diffs)
• merpp.cc (modified) (2 diffs)
• mfileio/MWriteRootFile.h (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mjobs/MJStar.cc (modified) (2 diffs)
• mreport/MReportPyrometer.cc (added)
• mreport/MReportPyrometer.h (added)
• mreport/MReportRun.cc (modified) (1 diff)
• mreport/Makefile (modified) (1 diff)
• mreport/ReportLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2008/06/10 Thomas Bretz
+
+   * mreport/MReportPyrometer.[h,cc]:
+     - added
+
+   * mreport/Makefile, mreport/ReportLinkDef.h:
+     - added MReportPyrometer
+
+   * mreport/MReportRun.cc:
+     - removed obsolete include of MAstro
+
+   * merpp.cc:
+     - added Pyrometer information
+
+   * mfileio/MWriteRootFile.h:
+     - added new member function AddTree to add a container with the
+       corresponding time-stamp
+
+   * mjobs/MCalibrateSignal.cc, mjobs/MJStar.cc:
+     - replaced some AddContainer by the new AddTree
+     - added Pyrometer information to in- and output, respectively
+
 
 

trunk/MagicSoft/Mars/NEWS

@@ -56 +56 @@
 
    * The liniking of the shared object is now done into a file defined
-     by ´mktemp´. This should be a local file system which accelerates
+     by 'mktemp'. This should be a local file system which accelerates
      liniking a lot.
 
@@ -64 +64 @@
 
    * Implemented cc file version 2008-20-02/0
+
+   * Added Pyroemeter information to output (stored in a new Tree
+     Pyrometer, needs a complete new merpp, i.e. new calibration)
 
  ;callisto

trunk/MagicSoft/Mars/merpp.cc

@@ -357 +357 @@
             w->AddContainer("MReportStarguider",  "Starguider");
             w->AddContainer("MTimeStarguider",    "Starguider");
+            w->AddContainer("MReportPyrometer",   "Pyrometer");
+            w->AddContainer("MTimePyrometer",     "Pyrometer");
             // w->AddContainer("MReportDAQ",         "DAQ");
             // w->AddContainer("MTimeDAQ",           "DAQ");
@@ -379 +381 @@
             r->AddToList("MReportTrigger");
             r->AddToList("MReportStarguider");
+            r->AddToList("MReportPyrometer");
             if (kRunNumber>0)
             {

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -133 +133 @@
     void AddCopySource(const char *tname, const char *bname=NULL);
 
+    void AddTree(const char *name, Bool_t force=kTRUE)
+    {
+        AddContainer(Form("MReport%s", name), name, force);
+        AddContainer(Form("MTime%s", name),   name, force);
+    }
+
     void Print(Option_t *t=NULL) const;
 

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");
     }
 

trunk/MagicSoft/Mars/mreport/MReportRun.cc

@@ -35 +35 @@
 
 #include "MLogManip.h"
-
-#include "MAstro.h"
 
 ClassImp(MReportRun);

trunk/MagicSoft/Mars/mreport/Makefile

@@ -33 +33 @@
            MReportFileRead.cc \
            MReportFileReadCC.cc \
-           MReportStarguider.cc
+           MReportStarguider.cc \
+           MReportPyrometer.cc
+
 ############################################################
 

trunk/MagicSoft/Mars/mreport/ReportLinkDef.h

@@ -15 +15 @@
 #pragma link C++ class MReportTrigger+;
 #pragma link C++ class MReportCurrents+;
+#pragma link C++ class MReportPyrometer+;
 
 #pragma link C++ class MReportHelp+;