Changeset 6727 for trunk/MagicSoft/Mars

Timestamp:

03/03/05 19:17:02 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -62 +62 @@
 
 // Other basic classes
-#include "MExtractTimeAndCharge.h"
+#include "MExtractTimeAndChargeSlidingWindow.h"
 
 // parameter containers
@@ -73 +73 @@
 #include "MHPedestalPix.h"
 #include "MHCalibrationPulseTimeCam.h"
+#include "MCalibrationPulseTimeCam.h"
 
 // tasks
@@ -995 +996 @@
       }
 
+    MExtractTimeAndChargeSlidingWindow exttest;
+
+    if (fPulsePosCheck && fExtractionType != kFundamental)
+      {
+        exttest.SetRange(0,25,0,0);
+        exttest.SetPedestals(&fPedestalCamIn);
+        tlist.AddToList(&exttest);
+        tlist.AddToList(&fillpul);
+      }
+
     if (!fPathIn.IsNull())
     {
@@ -1163 +1174 @@
     tlist.PrintStatistics();
 
+    fExtractor->SetFilter(0);
+
+    if (fPixelCheck)
+      {
+        MHPedestalCam *hcam = (MHPedestalCam*)plist.FindObject("MHPedestalCam");
+        if (hcam)
+          {
+            MHPedestalPix &pix1 = (MHPedestalPix&)(*hcam)[fCheckedPixId];
+            pix1.DrawClone("");
+          }
+      }
+    
+    if (fPulsePosCheck && fExtractionType != kFundamental)
+      {
+        MCalibrationPulseTimeCam *cam = (MCalibrationPulseTimeCam*)plist.FindObject("MCalibrationPulseTimeCam");
+        if (cam)
+          {
+            const Float_t meanpulsetime = cam->GetAverageArea(0).GetHiGainMean();
+            const Float_t sigmapulsetime = cam->GetAverageArea(0).GetHiGainSigma();
+            *fLog << inf << "Mean pulse time (cosmics): " << meanpulsetime << "+-" << sigmapulsetime << endl;
+          }
+      }
+    
+
     if (fDisplayType!=kDisplayNone)
         DisplayResult(plist);