Changeset 7210 for trunk/MagicSoft/Mars/mjobs

Timestamp:

07/22/05 13:18:44 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -47 +47 @@
 #include "MH3.h"
 #include "MHVsTime.h"
+#include "MHSectorVsTime.h"
 #include "MHCamEvent.h"
 #include "MHCamEventRot.h"
@@ -195 +196 @@
     readreal.AddTree("Drive",            MReadReports::kRequired);
     readreal.AddTree("Starguider",       MReadReports::kRequired);
+    readreal.AddTree("Currents",         MReadReports::kRequired);
     readreal.AddTree("CC");
     readreal.AddFiles(iter);
@@ -219 +221 @@
     clean.SetNamePedPhotCam("MPedPhotFromExtractorRndm");
 
-    //MSrcPosCalc            poscalc;
-    //MSrcPosCorrect         poscorrect;
-    MHillasCalc            hcalc;
+    MSrcPosCalc poscalc;
+    MHillasCalc hcalc;
     hcalc.Disable(MHillasCalc::kCalcConc);
 
@@ -233 +234 @@
     MFillH fillp2("MHPointing",       "MTimeStarguider", "FillStarguider");
     fillp1.SetBit(MFillH::kDoNotDisplay);
-    //fillp2.SetNameTab("Drive");
+    fillp1.SetBit(MFillH::kCanSkip);
+    fillp2.SetBit(MFillH::kCanSkip);
 
     MFillH fill0a(&evt0a,             "MSignalCam",      "FillSignalCam");
@@ -258 +260 @@
 
     // Data
-    write.AddContainer("MHillas",       "Events");
-    write.AddContainer("MHillasExt",    "Events");
-    write.AddContainer("MHillasSrc",    "Events");
-    write.AddContainer("MImagePar",     "Events");
-    write.AddContainer("MNewImagePar",  "Events");
-    write.AddContainer("MRawEvtHeader", "Events");
-    write.AddContainer("MPointingPos",  "Events");
+    write.AddContainer("MHillas",                   "Events");
+    write.AddContainer("MHillasExt",                "Events");
+    write.AddContainer("MHillasSrc",                "Events");
+    write.AddContainer("MImagePar",                 "Events");
+    write.AddContainer("MNewImagePar",              "Events");
+    write.AddContainer("MRawEvtHeader",             "Events");
+    write.AddContainer("MPointingPos",              "Events");
 
     // Run Header
-    write.AddContainer("MRawRunHeader", "RunHeaders");
-    write.AddContainer("MBadPixelsCam", "RunHeaders");
-    write.AddContainer("MGeomCam",      "RunHeaders");
-    write.AddContainer("MObservatory",  "RunHeaders");
+    write.AddContainer("MRawRunHeader",             "RunHeaders");
+    write.AddContainer("MBadPixelsCam",             "RunHeaders");
+    write.AddContainer("MGeomCam",                  "RunHeaders");
+    write.AddContainer("MObservatory",              "RunHeaders");
 
     // Muon Setup
-    write.AddContainer("BinningRadius",            "RunHeaders");
-    write.AddContainer("BinningArcWidth",          "RunHeaders");
-    write.AddContainer("BinningRingBroadening",    "RunHeaders");
-    write.AddContainer("BinningSizeVsArcRadius",   "RunHeaders");
-    write.AddContainer("MMuonSetup",               "RunHeaders");
+    write.AddContainer("BinningRadius",             "RunHeaders");
+    write.AddContainer("BinningArcWidth",           "RunHeaders");
+    write.AddContainer("BinningRingBroadening",     "RunHeaders");
+    write.AddContainer("BinningSizeVsArcRadius",    "RunHeaders");
+    write.AddContainer("MMuonSetup",                "RunHeaders");
 
     if (ismc)
     {
         // Monte Carlo Data
-        write.AddContainer("MMcEvt",               "Events");
-        write.AddContainer("MMcTrig",              "Events");
+        write.AddContainer("MMcEvt",                "Events");
+        write.AddContainer("MMcTrig",               "Events");
         // Monte Carlo Run Headers
-        write.AddContainer("MMcRunHeader",         "RunHeaders");
-        write.AddContainer("MMcTrigHeader",        "RunHeaders");
-        write.AddContainer("MMcFadcHeader",        "RunHeaders");
-        write.AddContainer("MMcConfigRunHeader",   "RunHeaders");
-        write.AddContainer("MMcCorsikaRunHeader",  "RunHeaders");
+        write.AddContainer("MMcRunHeader",          "RunHeaders");
+        write.AddContainer("MMcTrigHeader",         "RunHeaders");
+        write.AddContainer("MMcFadcHeader",         "RunHeaders");
+        write.AddContainer("MMcConfigRunHeader",    "RunHeaders");
+        write.AddContainer("MMcCorsikaRunHeader",   "RunHeaders");
     }
     else
@@ -298 +300 @@
         write.AddContainer("MTimeDrive",            "Drive");
         // Starguider
-        write.AddContainer("MReportStarguider",     "Starguider");
-        write.AddContainer("MTimeStarguider",       "Starguider");
+        write.AddContainer("MReportStarguider",     "Starguider", kFALSE);
+        write.AddContainer("MTimeStarguider",       "Starguider", kFALSE);
         // Effective On Time
         writet.AddContainer("MEffectiveOnTime",     "EffectiveOnTime");
@@ -306 +308 @@
 
     // What to write in muon tree
-    writem.AddContainer("MMuonSearchPar", "Muons");
-    writem.AddContainer("MMuonCalibPar",  "Muons");
-    writem.AddContainer("MHillas",        "Muons");
-    writem.AddContainer("MHillasExt",     "Muons");
-    writem.AddContainer("MHillasSrc",     "Muons");
-    writem.AddContainer("MImagePar",      "Muons");
-    writem.AddContainer("MNewImagePar",   "Muons");
-    writem.AddContainer("MRawEvtHeader",  "Muons");
-    writem.AddContainer("MPointingPos",   "Muons");
+    writem.AddContainer("MMuonSearchPar",           "Muons");
+    writem.AddContainer("MMuonCalibPar",            "Muons");
+    writem.AddContainer("MHillas",                  "Muons");
+    writem.AddContainer("MHillasExt",               "Muons");
+    writem.AddContainer("MHillasSrc",               "Muons");
+    writem.AddContainer("MImagePar",                "Muons");
+    writem.AddContainer("MNewImagePar",             "Muons");
+    writem.AddContainer("MRawEvtHeader",            "Muons");
+    writem.AddContainer("MPointingPos",             "Muons");
     if (ismc)
     {
         // Monte Carlo Data
-        writem.AddContainer("MMcEvt",     "Muons");
-        writem.AddContainer("MMcTrig",    "Muons");
+        writem.AddContainer("MMcEvt",               "Muons");
+        writem.AddContainer("MMcTrig",              "Muons");
     }
 
@@ -344 +346 @@
     tlist2.AddToList(&fill0a);
     tlist2.AddToList(&fill0b);
-    //tlist2.AddToList(&poscalc);
-    //tlist2.AddToList(&poscorrect);
+    tlist2.AddToList(&poscalc);
     tlist2.AddToList(&hcalc);
     tlist2.AddToList(&fill1);
@@ -389 +390 @@
     // ------------------------------------------------------------
 
+    // Initialize histogram
+    MHSectorVsTime histdc;
+    histdc.SetNameTime("MTimeCurrents");
+    histdc.SetTitle("Mean of all DC Currents;;<I> [nA]");
+    /*
+     // Define area index [0=inner, 1=outer]
+     // TArrayI inner(1); inner[0] = 0; histdc.SetAreaIndex(inner);
+     */
+
+    // Task to fill the histogram
+    MFillH filldc(&histdc, "MCameraDC", "FillDC");
+    filldc.SetNameTab("Currents");
+
     MFillH fillw("MHWeather", "MTimeCC", "FillWeather");
-    //tlist2.AddToList(&fill6);
-    //tlist2.AddToList(&fill7);
-    //tlist2.AddToList(&fill9);
 
     MPointingPosCalc pcalc;
+
+    // ------------------------------------------------------------
 
     tlist.AddToList(ismc ? (MTask*)&readmc : (MTask*)&readreal);
@@ -404 +417 @@
         tlist.AddToList(&fillp1, "Drive");
         tlist.AddToList(&fillp2, "Starguider");
+        tlist.AddToList(&filldc, "Currents");
     }
     tlist.AddToList(&write);