Changeset 5157 for trunk/MagicSoft/Mars/mjobs

Timestamp:

10/01/04 17:33:09 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (2 diffs)
• MJStar.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -293 +293 @@
     MPedCalcFromLoGain     pedlo;
     MMcPedestalCopy        pcopy;
-    //MExtractSlidingWindow  extsignal;
     MTaskEnv taskenv1("ExtractSignal");
+    MTaskEnv taskenv2("ExtractTime");
     taskenv1.SetDefault(extractor1);
-    //MExtractTimeFastSpline exttime;
-    MTaskEnv taskenv2("ExtractTime");
     taskenv2.SetDefault(extractor2);
     MCalibrateData         calib;
@@ -313 +311 @@
     MHCamEvent evt5(2, "Unsuitable",  "Unsuitable event ratio;;%");
     MHCamEvent evt6(0, "Times",       "Arrival Time;;T [slice]");
+    evt0.EnableVariance();
+    evt2.EnableVariance();
+    evt3.EnableVariance();
+    evt6.EnableVariance();
 
     MFillH fill0(&evt0, "MPedestalCam",        "FillPedestalFLG");

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -46 +46 @@
 #include "MHVsTime.h"
 #include "MHCamEvent.h"
+#include "MHCamEventRot.h"
 #include "MBinning.h"
 
@@ -59 +60 @@
 #include "MWriteRootFile.h"
 
+#include "MObservatory.h"
 #include "MPointingPosCalc.h"
-//#include "MSrcPosFromModel.h"
 
 ClassImp(MJStar);
@@ -143 +144 @@
     MParList plist;
     plist.AddToList(this); // take care of fDisplay!
+
+    MObservatory obs;
+    plist.AddToList(&obs);
 
     // Setup Tasklist
@@ -184 +188 @@
 
     // ------------------ Setup histograms and fill tasks ----------------
-    MHCamEvent evt0("Cleaned", "Signal after Cleaning;;S [\\gamma]");
-    evt0.SetType(0);
+    MHCamEvent evt0a(0, "Cleaned", "Signal after Cleaning;;S [\\gamma]");
+    MHCamEvent evt0b(0, "UsedPix", "Pixels marked Used;;Marked Used [%]");
+    evt0b.SetThreshold(0);
+
+    //MHCamEventRot evt0r("UsedRot", "Pixels marked Used (derotated)");
+    //evt0r.SetThreshold(0);
 
     MH3 h1("MEventRate.fRate");
@@ -209 +217 @@
     MFillH fillvs(&hvs,           "MTime",        "FillEventRate10s");
 
-    MFillH fill0(&evt0,           "MCerPhotEvt",  "FillCerPhotEvt");
+    MFillH fill0a(&evt0a,         "MCerPhotEvt",  "FillCerPhotEvt");
+    MFillH fill0b(&evt0b,         "MCerPhotEvt",  "FillCntUsedPixels");
+    //MFillH fill0r(&evt0r,         "MCerPhotEvt",  "FillCntUsedRotated");
     MFillH fill1("MHHillas",      "MHillas",      "FillHillas");
     MFillH fill2("MHHillasExt",   "",             "FillHillasExt");
@@ -222 +232 @@
     //MFillH fill9("MHCerPhot");
 
+    //fill0r.SetDrawOption("colz");
     fill8.SetNameTab("EvtRate");
     fill9.SetNameTab("EffOnTime");
@@ -281 +292 @@
     //tlist2.AddToList(&fillb);
     tlist2.AddToList(&clean);
-    tlist2.AddToList(&fill0);
+    tlist2.AddToList(&fill0a);
+    tlist2.AddToList(&fill0b);
+    tlist2.AddToList(&fill0r);
     tlist2.AddToList(&hcalc);
     tlist2.AddToList(&fill1);