Changeset 7829 for trunk/MagicSoft/Mars/mjobs

Timestamp:

08/01/06 14:13:34 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (3 diffs)
• MJCalibration.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -581 +581 @@
     MHCamEvent evt7(  6, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
     MHCamEvent evt8(  0, "Conv",       "Calibration Conv. Factors;;[phe/fadc cnts]");
-    MHCamEvent evt9(  7, "PulsePos",   "Pulse Position of cosmics (>15phe);;T"); //Calibration Conv. Factors;;[phe/fadc cnts]
+    MHCamEvent evt9(  7, "PulsePos",   "Pulse Position of cosmics (>15phe);;T");
+    MHCamEvent evtH( 11, "PulseHi",    "Pulse Position of Hi-Gain;;T");
+    MHCamEvent evtL( 10, "PulseLo",    "Pulse Position of Lo-Gain;;T");
     evt6.SetThreshold();
 
@@ -594 +596 @@
     MFillH fill8(&evt8, "MCalibrationIntensityConstCam", "FillConv");
     MFillH fill9(&evt9, "MSignalCam",                    "FillPulse");
+    MFillH fillH(&evtH, "MSignalCam",                    "FillPulseHi");
+    MFillH fillL(&evtL, "MSignalCam",                    "FillPulseLo");
 
     MTaskEnv fillflorian("FinalFantasy");
@@ -721 +725 @@
         tlist2.AddToList(&fill7);
     tlist2.AddToList(&fill9);
+    tlist2.AddToList(&fillH);
+    tlist2.AddToList(&fillL);
 
     tlist2.AddToList(&fillflorian);

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -500 +500 @@
 
         const Float_t convphe  = pix.GetMeanConvFADC2Phe();
-        const Float_t quaeff   = qe.GetQECascadesFFactor(0.);
+        const Float_t quaeff   = qe.GetQECascadesFFactor();
         
         disp35.Fill(i,convphe/quaeff);