Changeset 3862 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/28/04 11:15:08 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (6 diffs)
• MJCalibration.h (modified) (5 diffs)
• MJExtractCalibTest.cc (modified) (7 diffs)
• MJExtractCalibTest.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -38 +38 @@
 //End_Html
 //
-// Different signal extractors can be chosen via the command SetExtractorLevel(UInt_t i)
-// Up to now, the following extractors are available:
-// i=1: Use MExtractSignal  (fixed window)
-// i=2: Use MExtractSignal2 (sliding window: default)
-// i=3: Use MExtractSignal3 (coherent sliding window for all pixels)
+// Different signal extractors can be set with the command SetExtractor()
+// Only extractor deriving from MExtractor can be set, default is MExtractSlidingWindow
 //
 // At the end of the eventloop, plots and results are displayed, depending on 
@@ -119 +116 @@
 #include "MBadPixelsMerge.h"
 #include "MBadPixelsCam.h"
-#include "MExtractSignal.h"
+#include "MExtractor.h"
 #include "MExtractPINDiode.h"
 #include "MExtractBlindPixel.h"
-#include "MExtractSignal2.h"
-#include "MExtractSignal3.h"
+#include "MExtractSlidingWindow.h"
 #include "MFCosmics.h"
 #include "MContinue.h"
@@ -143 +139 @@
 // Default constructor. 
 //
-// Sets fRuns to 0, fColor to kNONE, fDisplay to kNormalDisplay, 
+// Sets fRuns to 0, fExtractor to NULL, fColor to kNONE, fDisplay to kNormalDisplay, 
 // fRelTime to kFALSE, fExtractorLevel to 2, fArrivalTimeLevel to 2
 //
 MJCalibration::MJCalibration(const char *name, const char *title) 
-    : fRuns(0), fColor(MCalibrationCam::kNONE), fDisplayType(kNormalDisplay),
-      fRelTimes(kFALSE), fDataCheck(kFALSE), fExtractorLevel(2), fArrivalTimeLevel(2)
+    : fRuns(0), fExtractor(NULL), fColor(MCalibrationCam::kNONE), fDisplayType(kNormalDisplay),
+      fRelTimes(kFALSE), fDataCheck(kFALSE), fArrivalTimeLevel(2)
 {
   fName  = name  ? name  : "MJCalibration";
@@ -765 +761 @@
 //   2)  MBadPixelsMerge
 //   3)  MGeomApply
-//   4)  MExtractSignal, MExtractSignal2 or MExtractSignal3, depending on fExtractorLevel
+//   4)  MExtractor
 //   5)  MExtractPINDiode
 //   6)  MExtractBlindPixel
@@ -839 +835 @@
   MExtractPINDiode         pinext;
   MExtractBlindPixel       blindext;
-  MExtractSignal           extract1; 
-  MExtractSignal2          extract2;
-  MExtractSignal3          extract3;
+  MExtractSlidingWindow    extract2;
   MArrivalTimeCalc         tmecalc1;
   MArrivalTimeCalc2        tmecalc2;
@@ -872 +866 @@
   tlist.AddToList(&apply);
 
-  if (fExtractorLevel <= 1)
-    tlist.AddToList(&extract1);
-  else if (fExtractorLevel == 2) 
-    tlist.AddToList(&extract2);
-  else if (fExtractorLevel == 3) 
-    tlist.AddToList(&extract3);
+  if (fExtractor)
+    tlist.AddToList(fExtractor);
   else
     {
-      *fLog << err << GetDescriptor() 
-            << ": No valid Signal extractor has been chosen, have only: " << fExtractorLevel 
-            << " aborting..." << endl;
-      return kFALSE;
+      *fLog << warn << GetDescriptor() 
+            << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
+      tlist.AddToList(&extract2);
     }
   

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -21 +21 @@
 class MParList;
 class MPedestalCam;
+class MExtractor;
 class MJCalibration : public MParContainer, public MGCamDisplays
 {
@@ -29 +30 @@
   TString fOutputPath;                                     // Path to the output files
   
-  MRunIter *fRuns;                                         // Calibration files
+  MRunIter   *fRuns;                                       // Calibration files
+  MExtractor *fExtractor;                                  // Signal extractor
   
   MBadPixelsCam          fBadPixels;                       // Bad Pixels cam, can be set from previous runs
@@ -44 +46 @@
   Bool_t fRelTimes;                                        // Flag if relative times have to be calibrated
   Bool_t fDataCheck;                                       // Flag if the data check is run on raw data
-  UInt_t fExtractorLevel;                                  // Level signal extractor (e.g. MExtractSignal2) 
   UInt_t fArrivalTimeLevel;                                // Level arr. time extractor (e.g. MArrivalTimeCalc2)
   
@@ -67 +68 @@
   const MBadPixelsCam    &GetBadPixels() const    { return fBadPixels;      }
   
-  void SetBadPixels(const MBadPixelsCam &bad)    { bad.Copy(fBadPixels);   }
+  void SetBadPixels(const MBadPixelsCam &bad)     { bad.Copy(fBadPixels);   }
+  void SetExtractor(MExtractor* ext)              { fExtractor = ext; }
   void SetQECam    (const MCalibrationQECam &qe) { qe.Copy(fQECam);        }    
   void SetColor    (const MCalibrationCam::PulserColor_t color) { fColor = color; }
@@ -83 +85 @@
 
   // Extractors
-  void SetExtractorLevel    (const UInt_t i=1    ) { fExtractorLevel   = i; }
   void SetArrivalTimeLevel  (const UInt_t i=1    ) { fArrivalTimeLevel = i; }  
-      
   
   Bool_t ReadCalibrationCam();

trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc

@@ -54 +54 @@
 #include "MReadMarsFile.h"
 #include "MGeomApply.h"
-#include "MExtractSignal.h"
+#include "MExtractSlidingWindow.h"
+#include "MExtractor.h"
 #include "MFillH.h"
 #include "MCalibrate.h"
@@ -65 +66 @@
 
 using namespace std;
-
-MJExtractCalibTest::MJExtractCalibTest(const char *name, const char *title) : fRuns(0)
+// --------------------------------------------------------------------------
+//
+// Default constructor. 
+//
+// Sets fRuns to 0, fExtractor to NULL
+//
+MJExtractCalibTest::MJExtractCalibTest(const char *name, const char *title) 
+    : fRuns(NULL), fExtractor(NULL)
 {
     fName  = name  ? name  : "MJExtractCalibTest";
@@ -93 +100 @@
   
   // Create histograms to display
-  MHCamera disp1 (geomcam, "Cal;Photons",           "Mean of calibrated Photons");
-  MHCamera disp2 (geomcam, "Cal;SigmaPhotons",      "Sigma of calibrated photons");
-  MHCamera disp3 (geomcam, "Cal;PhotonsPerArea",    "Mean Photons per Area");
-  MHCamera disp4 (geomcam, "Cal;SigmaPhotPerArea",  "Sigma Photons per Area");
+  MHCamera disp1 (geomcam, "Test;Photons",           "Mean of calibrated Photons");
+  MHCamera disp2 (geomcam, "Test;SigmaPhotons",      "Sigma of calibrated photons");
+  MHCamera disp3 (geomcam, "Test;PhotonsPerArea",    "Equiv. Cherenkov Photons per Area");
+  MHCamera disp4 (geomcam, "Test;SigmaPhotPerArea",  "Sigma equiv. Cher. Photons per Area");
 
   // Fitted charge means and sigmas
@@ -199 +206 @@
   static_cast<MRead&>(read).AddFiles(*fRuns);
   
-  MGeomApply      apply; // Only necessary to craete geometry
-  MExtractSignal  extract;
-  MCalibrate      photcalc;
+  MGeomApply            apply; // Only necessary to craete geometry
+  MExtractSlidingWindow extract2;
+  MCalibrate            photcalc;
   photcalc.SetCalibrationMode(MCalibrate::kFfactor);
 
@@ -223 +230 @@
   tlist.AddToList(&read);
   tlist.AddToList(&apply);
-  tlist.AddToList(&extract);
+
+  if (fExtractor)
+    tlist.AddToList(fExtractor);
+    else
+    {
+      *fLog << warn << GetDescriptor() 
+            << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
+      tlist.AddToList(&extract2);
+    }
+
   if (TestBit(kEnableGraphicalOutput))
     tlist.AddToList(&fill);
@@ -328 +344 @@
     plist.AddToList(&tlist);
 
-    MGeomApply      apply; // Only necessary to craete geometry
-    MExtractSignal  extract;
-    MCalibrate      calib;
-    MPedPhotCalc    calc;
+    MGeomApply            apply; // Only necessary to craete geometry
+    MExtractSlidingWindow extract2;
+    MCalibrate            calib;
+    MPedPhotCalc          calc;
 
     MHCamEvent evt1("ExtOffset");
@@ -342 +358 @@
     tlist.AddToList(&read);
     tlist.AddToList(&apply);
-    tlist.AddToList(&extract);
+
+    if (fExtractor)
+      tlist.AddToList(fExtractor);
+    else
+      {
+      *fLog << warn << GetDescriptor() 
+            << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
+      tlist.AddToList(&extract2);
+    }
+
     if (TestBit(kEnableGraphicalOutput))
         tlist.AddToList(&fill1);

trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.h

@@ -20 +20 @@
 class MCalibrationChargeCam;
 class MCalibrationQECam;
-class MPedPhotCam;
-class MHCalibrationTestCam;
+class MExtractor;
 class MJExtractCalibTest : public MParContainer, public MGCamDisplays
 {
@@ -28 +27 @@
   TString fOutputPath;
 
-  MRunIter *fRuns;
+  MRunIter   *fRuns;                                       // Data files
+  MExtractor *fExtractor;                                  // Signal extractor
   
   MBadPixelsCam        fBadPixels;
@@ -54 +54 @@
   const MBadPixelsCam &GetBadPixels()  const { return fBadPixels; }
   
+  void SetExtractor(MExtractor* ext)              { fExtractor = ext; }
   void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }