Changeset 5143 for trunk/MagicSoft/Mars/mjobs

Timestamp:

09/28/04 12:25:50 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

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

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -306 +306 @@
     MBadPixelsTreat        treat;
 
-    MHCamEvent evt0("PedestalFLG");
-    MHCamEvent evt1("Extra'd");
-    MHCamEvent evt2("PedPhot");
-    MHCamEvent evt3("Interp'd");
-    MHCamEvent evt4("Unsuitable");
-    MHCamEvent evt5("Times");
-    evt0.SetType(0);
-    evt1.SetType(0);
-    evt2.SetType(0);
-    evt3.SetType(0);
-    evt4.SetType(2);
-    evt5.SetType(0);
+    MHCamEvent evt0(0, "PedestalFLG", "Pedestal from Lo Gain;;P [fadc/sl]");
+    MHCamEvent evt1(0, "Extra'd",     "Extracted Signal;;S [fadc/sl]");
+    MHCamEvent evt2(0, "PedPhot",     "Calibrated Pedestal;;P [\\gamma]");
+    MHCamEvent evt3(1, "PedRMS",      "Calibrated Pedestal RMS;;\\sigma_{p} [\\gamma]");
+    MHCamEvent evt4(0, "Interp'd",    "Interpolated Signal;;S [\\gamma]");
+    MHCamEvent evt5(2, "Unsuitable",  "Unsuitable event ratio;;%");
+    MHCamEvent evt6(0, "Times",       "Arrival Time;;T [slice]");
+
     MFillH fill0(&evt0, "MPedestalCam",        "FillPedestalFLG");
     MFillH fill1(&evt1, "MExtractedSignalCam", "FillExtracted");
     MFillH fill2(&evt2, "MPedPhotCam",         "FillPedPhot");
-    MFillH fill3(&evt3, "MCerPhotEvt",         "FillInterpolated");
-    MFillH fill4(&evt4, "MBadPixelsCam",       "FillUnsuitable");
-    MFillH fill5(&evt5, "MArrivalTime",        "FillTimes");
+    MFillH fill3(&evt3, "MPedPhotCam",         "FillPedRMS");
+    MFillH fill4(&evt4, "MCerPhotEvt",         "FillInterpolated");
+    MFillH fill5(&evt5, "MBadPixelsCam",       "FillUnsuitable");
+    MFillH fill6(&evt6, "MArrivalTime",        "FillTimes");
 
     MWriteRootFile write(2, Form("%s{s/_D_/_Y_}", fPathOut.Data()), fOverwrite);
@@ -386 +383 @@
     tlist2.AddToList(&fill4);
     tlist2.AddToList(&fill5);
+    tlist2.AddToList(&fill6);
 
     // Setup List for Drive-tree

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -169 +169 @@
     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;
@@ -179 +184 @@
 
     // ------------------ Setup histograms and fill tasks ----------------
-    MHCamEvent evt0("Cleaned");
+    MHCamEvent evt0("Cleaned", "Signal after Cleaning;;S [\\gamma]");
     evt0.SetType(0);
 
     MH3 h1("MEventRate.fRate");
     h1.SetName("MHEventRate");
+    h1.SetTitle("Event Rate distribution;R [Hz];Counts");
     h1.SetLogy();
 /*
@@ -194 +200 @@
     plist.AddToList(&b1);
 
-    MFillH fill0(&evt0, "MCerPhotEvt",            "FillCerPhotEvt");
+    MHVsTime hvs("MEventRate.fRate");
+    hvs.SetTitle("Rate per 500 events;R [Hz];Counts");
+    hvs.SetNumEvents(500);
+
+    MContinue cont1("MEventRate2.fRate/MEventRate.fRate>1.1");
+    MContinue cont2("MEventRate.fRate/MEventRate2.fRate>1.1");
+
+    MFillH fillvs(&hvs,           "MTime",        "FillEventRate10s");
+
+    MFillH fill0(&evt0,           "MCerPhotEvt",  "FillCerPhotEvt");
     MFillH fill1("MHHillas",      "MHillas",      "FillHillas");
     MFillH fill2("MHHillasExt",   "",             "FillHillasExt");
@@ -257 +272 @@
         tlist2.AddToList(&cont);
         tlist2.AddToList(&rate);
-        //tlist2.AddToList(&rate10000);
+        tlist2.AddToList(&rate1);
+        tlist2.AddToList(&fillvs);
+        tlist2.AddToList(&cont1);
+        tlist2.AddToList(&cont2);
         tlist2.AddToList(&fill8);
         tlist2.AddToList(&fill9);