Changeset 6858 for trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

Timestamp:

03/18/05 18:07:46 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -53 +53 @@
 #include "MGeomCam.h"
 #include "MHCamEvent.h"
+//#include "MHCamEventTH.h"
 #include "MPedestalCam.h"
 #include "MBadPixelsCam.h"
@@ -610 +611 @@
     MHCamEvent evt5(0, "Interp'd",   "Interpolated Signal;;S [phe]");
     MHCamEvent evt6(2, "Unsuitable", "Fraction of unsuitable events per Pixel;;[1]");
-    MHCamEvent evt7(0, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
+    MHCamEvent evt7(6, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
     MHCamEvent evt8(0, "Conv",       "Calibration Conv. Factors;;[phe/fadc cnts]");
-    //MHCamEvent evt9(0, "PulsePos",   "Pulse Position of cosmics"); //Calibration Conv. Factors;;[phe/fadc cnts]
-
+    MHCamEvent evt9(7, "PulsePos",  "Pulse Position of cosmics (>15phe);;T"); //Calibration Conv. Factors;;[phe/fadc cnts]
+    /*
+     MHCamEventTH evt9(6, "PulsePos",  "Pulse Position of cosmics"); //Calibration Conv. Factors;;[phe/fadc cnts]
+     evt9.SetNameThreshold("MCerPhotEvt");
+     evt9.SetThreshold(15);
+     */
+/*
     evt0.EnableSqrtVariance();
     evt1.EnableSqrtVariance();
@@ -622 +628 @@
     evt7.EnableSqrtVariance();
     evt8.EnableSqrtVariance();
-
+  */
     MFillH fill0(&evt0, "MPedestalFundamental",    "FillPedFLG");
     MFillH fill1(&evt1, "MPedestalFromExtractorRndm", "FillPedRmsFLG");
@@ -630 +636 @@
     MFillH fill5(&evt5, "MCerPhotEvt",             "FillInterpolated");
     MFillH fill6(&evt6, "MBadPixelsCam",           "FillUnsuitable");
-    MFillH fill7(&evt7, "MArrivalTime",            "FillTimes");
+    MFillH fill7(&evt7, "MCerPhotEvt",             "FillTimes");
     MFillH fill8(&evt8, "MCalibConstCam",          "FillConv");
-    //MFillH fill9(&evt9, "MCalibConstCam",          "FillPulse");
+    MFillH fill9(&evt9, "MCerPhotEvt",             "FillPulse");
 
     MTaskEnv fillflorian("FinalFantasy");
     fillflorian.SetDefault();
-
-    // Write the special MC tree
-    MWriteRootFile writemc(2, fname, fOverwrite?"RECREATE":"NEW");
-    writemc.SetName("WriteMC");
-    writemc.AddContainer("MMcEvtBasic", "OriginalMC");
 
     // The second rule is for the case reading raw-files!
@@ -664 +665 @@
     write.AddContainer("MTime",                     "Events",     kFALSE);
     write.AddContainer("MRawEvtHeader",             "Events");
-    write.AddContainer("MArrivalTime",              "Events",     kFALSE);
+    //write.AddContainer("MArrivalTime",              "Events",     kFALSE);
     write.AddContainer("MPointingPos",              "Events",     kFALSE);
     // Slow-Control: Current-tree
@@ -688 +689 @@
     write.AddContainer("MReportCC",                 "CC",         kFALSE);
     write.AddContainer("MTimeCC",                   "CC",         kFALSE);
+
+    // Write the special MC tree
+    MWriteRootFile writemc(2, fname, fOverwrite?"RECREATE":"NEW");
+    writemc.SetName("WriteMC");
+    writemc.AddContainer("MMcEvtBasic", "OriginalMC");
 
     // Now setup tasklist for events
@@ -754 +760 @@
     if (extractor2 || extractor1->InheritsFrom("MExtractTimeAndCharge"))
       tlist2.AddToList(&fill7);
+    tlist2.AddToList(&fill9);
 
     tlist2.AddToList(&fillflorian);