Changeset 7196 for trunk/MagicSoft/Mars/mjobs

Timestamp:

07/19/05 11:04:43 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCut.cc (modified) (4 diffs)
• MJSpectrum.cc (modified) (3 diffs)
• MJStar.cc (modified) (9 diffs)

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -51 +51 @@
 #include "MTaskEnv.h"
 #include "MSrcPosCalc.h"
+#include "MSrcPosCorrect.h"
 #include "MHillasCalc.h"
 #include "MFillH.h"
@@ -335 +336 @@
     write->AddContainer("MNewImagePar2",  "Events", kFALSE);
     write->AddContainer("MHadronness",    "Events", kFALSE);
-    write->AddContainer("MEnergyEst",     "Events", kFALSE);
+    write->AddContainer("MSrcPosCam",     "Events", kFALSE);
+    write->AddContainer("MSrcPosAnti",    "Events", kFALSE);
     write->AddContainer("ThetaSquared",   "Events", kFALSE);
+    write->AddContainer("OpticalAxis",    "Events", kFALSE);
     write->AddContainer("Disp",           "Events", kFALSE);
     write->AddContainer("MTime",          "Events", kFALSE);
@@ -549 +552 @@
     scalc.SetMode(fIsWobble?MSrcPosCalc::kWobble:MSrcPosCalc::kOffData); /********************/
 
+    MSrcPosCorrect scor;
+
     MHillasCalc hcalc;
     MHillasCalc hcalc2("MHillasCalcAnti");
@@ -558 +563 @@
     MTaskList tlist2;
     tlist2.AddToList(&scalc);
+    tlist2.AddToList(&scor);
     tlist2.AddToList(&hcalc);
     if (fIsWobble)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -77 +77 @@
 #include "MFillH.h"
 #include "MHillasCalc.h"
-#include "MSrcPosCalc.h"
+//#include "MSrcPosCalc.h"
 #include "MContinue.h"
 
@@ -968 +968 @@
 
     // Get correct source position
-    MSrcPosCalc calc;
+    //MSrcPosCalc calc;
 
     // Calculate corresponding Hillas parameters
-    MHillasCalc hcalc1;
-    MHillasCalc hcalc2("MHillasCalcAnti");
-    hcalc1.SetFlags(MHillasCalc::kCalcHillasSrc);
-    hcalc2.SetFlags(MHillasCalc::kCalcHillasSrc);
-    hcalc2.SetNameHillasSrc("MHillasSrcAnti");
-    hcalc2.SetNameSrcPosCam("MSrcPosAnti");
+    /*
+     MHillasCalc hcalc1;
+     MHillasCalc hcalc2("MHillasCalcAnti");
+     hcalc1.SetFlags(MHillasCalc::kCalcHillasSrc);
+     hcalc2.SetFlags(MHillasCalc::kCalcHillasSrc);
+     hcalc2.SetNameHillasSrc("MHillasSrcAnti");
+     hcalc2.SetNameSrcPosCam("MSrcPosAnti");
+     */
 
     // Fill collection area and energy estimator (unfolding)
@@ -1034 +1036 @@
     if (!fRawMc && fNoThetaWeights)
         tlist2.AddToList(&contsel);
-    tlist2.AddToList(&calc);
-    tlist2.AddToList(&hcalc1);
-    tlist2.AddToList(&hcalc2);
+    //tlist2.AddToList(&calc);
+    //tlist2.AddToList(&hcalc1);
+    //tlist2.AddToList(&hcalc2);
     tlist2.AddToList(&weight);
     tlist2.AddToList(&fill1a);

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -62 +62 @@
 #include "MImgCleanStd.h"
 #include "MSrcPosCalc.h"
+#include "MSrcPosCorrect.h"
 #include "MHillasCalc.h"
 #include "MMuonSearchParCalc.h"
@@ -192 +193 @@
     MReadReports readreal;
     readreal.AddTree("Events", "MTime.", MReadReports::kMaster);
-    readreal.AddTree("Drive", MReadReports::kRequired);
+    readreal.AddTree("Drive",            MReadReports::kRequired);
+    readreal.AddTree("Starguider",       MReadReports::kRequired);
     readreal.AddTree("CC");
-    //read.AddTree("Trigger");
-    //read.AddTree("Camera");
-    //read.AddTree("Currents");
     readreal.AddFiles(iter);
 
@@ -211 +210 @@
     MGeomApply             apply; // Only necessary to craete geometry
     MEventRateCalc         rate;
-    //MEventRateCalc         rate1; // 5min
     rate.SetNumEvents(1200);
-    //rate1.SetNumEvents(60000);
-    //rate1.SetNameEventRate("MEventRate2");
-    //rate1.SetNameTimeRate("MTimeRate2");
-
-    /*
-    MEventRateCalc         rate10000;
-    rate10000.SetNameEventRate("MEventRate10000");
-    rate10000.SetNumEvents(10000);
- */
-    //MBadPixelsMerge        merge(&badpix);
 
     MFSoftwareTrigger swtrig;
@@ -228 +216 @@
     contsw.SetInverted();
 
-
     MImgCleanStd           clean;
     clean.SetNamePedPhotCam("MPedPhotFromExtractorRndm");
 
-    MSrcPosCalc            poscalc;
+    //MSrcPosCalc            poscalc;
+    //MSrcPosCorrect         poscorrect;
     MHillasCalc            hcalc;
     hcalc.Disable(MHillasCalc::kCalcConc);
@@ -241 +229 @@
     evt0b.SetThreshold(0);
 
-    //MHCamEventRot evt0r("UsedRot", "Pixels marked Used (derotated)");
-    //evt0r.SetThreshold(0);
-
-    MH3 h1("MEventRate.fRate");
-    h1.SetName("MHEventRate");
-    h1.SetTitle("Event Rate distribution;R [Hz];Counts");
-    h1.SetLogy();
-/*
-    MH3 h12("MEventRate10000.fRate");
-    h12.SetName("MHEventRate");
-    h12.SetLogy();
- */
-    MBinning b1("BinningMHEventRate");
-    b1.SetEdges(150, 0, 1500);
-    plist.AddToList(&b1);
-
-    MHVsTime hvs("MEventRate.fRate");
-    hvs.SetTitle("Rate per 500 events;;R [Hz]");
-    hvs.SetNumEvents(500);
-    hvs.SetMinimum(0);
-
-    //MContinue cont1("MEventRate2.fRate/MEventRate.fRate>1.1");
-    //MContinue cont2("MEventRate.fRate/MEventRate2.fRate>1.1");
-
-    MFillH fillvs(&hvs,           "MTime",        "FillEventRate10s");
-
-    MFillH fill0a(&evt0a,         "MSignalCam",   "FillSignalCam");
-    MFillH fill0b(&evt0b,         "MSignalCam",   "FillCntUsedPixels");
-    //MFillH fill0r(&evt0r,         "MCerPhotEvt",  "FillCntUsedRotated");
-    MFillH fill1("MHHillas",      "MHillas",      "FillHillas");
-    MFillH fill2("MHHillasExt",   "",             "FillHillasExt");
-    MFillH fill3("MHHillasSrc",   "MHillasSrc",   "FillHillasSrc");
-    MFillH fill4("MHImagePar",    "MImagePar",    "FillImagePar");
-    MFillH fill5("MHNewImagePar", "MNewImagePar", "FillNewImagePar");
-    //MFillH fill6("MHImageParTime","MImageParTime","FillImageParTime");
-    //MFillH fill7("MHNewImagePar2","MNewImagePar2","FillNewImagePar2");
-    MFillH fill8(&h1,             "",             "FillEventRate");
-    MFillH fill9("MHEffectiveOnTime", "MTime",    "FillEffOnTime");
-    //MFillH fillb(&h12, "", "FillEvtRate2");
-    //MFillH fill9("MHCerPhot");
-
-    //fill0r.SetDrawOption("colz");
-    fill8.SetNameTab("EvtRate");
+    MFillH fillvs("MHRate",           "MTime",           "FillEventRate");
+    MFillH fillp1("MHPointing",       "MTimeDrive",      "FillDrive");
+    MFillH fillp2("MHPointing",       "MTimeStarguider", "FillStarguider");
+    fillp1.SetBit(MFillH::kDoNotDisplay);
+    //fillp2.SetNameTab("Drive");
+
+    MFillH fill0a(&evt0a,             "MSignalCam",      "FillSignalCam");
+    MFillH fill0b(&evt0b,             "MSignalCam",      "FillCntUsedPixels");
+    MFillH fill1("MHHillas",          "MHillas",         "FillHillas");
+    MFillH fill2("MHHillasExt",       "",                "FillHillasExt");
+    MFillH fill3("MHHillasSrc",       "MHillasSrc",      "FillHillasSrc");
+    MFillH fill4("MHImagePar",        "MImagePar",       "FillImagePar");
+    MFillH fill5("MHNewImagePar",     "MNewImagePar",    "FillNewImagePar");
+    MFillH fill9("MHEffectiveOnTime", "MTime",           "FillEffOnTime");
+
+    //fillvs.SetNameTab("Rate");
     fill9.SetNameTab("EffOnTime");
 
@@ -301 +262 @@
     write.AddContainer("MImagePar",     "Events");
     write.AddContainer("MNewImagePar",  "Events");
-    //write.AddContainer("MNewImagePar2", "Events");
-    //write.AddContainer("MImageParTime", "Events");
     write.AddContainer("MRawEvtHeader", "Events");
     write.AddContainer("MPointingPos",  "Events");
@@ -333 +292 @@
     else
     {
-        write.AddContainer("MTime",                "Events");
+        write.AddContainer("MTime",                 "Events");
         // Drive
-        write.AddContainer("MReportDrive",         "Drive");
-        write.AddContainer("MTimeDrive",           "Drive");
+        write.AddContainer("MReportDrive",          "Drive");
+        write.AddContainer("MTimeDrive",            "Drive");
+        // Starguider
+        write.AddContainer("MReportStarguider",     "Starguider");
+        write.AddContainer("MTimeStarguider",       "Starguider");
         // Effective On Time
         writet.AddContainer("MEffectiveOnTime",     "EffectiveOnTime");
@@ -375 +337 @@
         tlist2.AddToList(&rate);
         tlist2.AddToList(&fillvs);
-        tlist2.AddToList(&fill8);
         tlist2.AddToList(&fill9);
         tlist2.AddToList(&writet);
     }
-    //tlist2.AddToList(&fillb);
     tlist2.AddToList(&clean);
     tlist2.AddToList(&fill0a);
     tlist2.AddToList(&fill0b);
-    //tlist2.AddToList(&fill0r);
-    tlist2.AddToList(&poscalc);
+    //tlist2.AddToList(&poscalc);
+    //tlist2.AddToList(&poscorrect);
     tlist2.AddToList(&hcalc);
     tlist2.AddToList(&fill1);
@@ -439 +399 @@
     tlist.AddToList(&tlist2, "Events");
     if (!ismc)
+    {
         tlist.AddToList(&fillw,  "CC");
+        tlist.AddToList(&fillp1, "Drive");
+        tlist.AddToList(&fillp2, "Starguider");
+    }
     tlist.AddToList(&write);