Changeset 3913 for trunk/MagicSoft

Timestamp:

04/30/04 17:11:54 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/calibration.C (modified) (2 diffs)
• mcalib/MHCalibrationRelTimeCam.cc (modified) (3 diffs)
• mjobs/MJCalibration.cc (modified) (7 diffs)
• mjobs/MJCalibration.h (modified) (5 diffs)
• msignal/MExtractTimeHighestIntegral.cc (added)
• msignal/MExtractTimeHighestIntegral.h (added)
• msignal/Makefile (modified) (1 diff)
• msignal/SignalLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -46 +46 @@
    * msignal/MExtractPINDiode.[h,cc]
      - now deriving from MExtractor
+
+   * msignal/Makefile
+   * msignal/SignalLinkDef.h
+   * msignal/MExtractTimeSpline.[h,cc]
+   * msignal/MExtractTimeHighestIntegral.[h,cc]
+     - replacements for MArrivalTimeCalc and MArrivalTimeCalc2
+
+   * mjobs/MJCalibration.[h,cc]
+     - Set time extractor by pointer 
 
 

trunk/MagicSoft/Mars/macros/calibration.C

@@ -55 +55 @@
 //
 /////////////////////////////////////////////////////////////////////////////
-//static const TString inpath = "/home/rootdata/Calib/2004_04_16/";
-static const TString inpath = "/mnt/Data/rootdata/CrabNebula/2003_12_01/";
-static const Int_t pedrun  = 3340;
-static const Int_t calrun1 = 3341;
+static const TString inpath = "/mnt/Data/rootdata/Miscellaneous/2004_03_03/";
+static const Int_t pedrun  = 20123;
+static const Int_t calrun1 = 20126;
 static const Int_t calrun2 = 0;
-/*
-static const Int_t pedrun  = 22265;
-static const Int_t calrun1 = 22300;
-static const Int_t calrun2 = 0;
-*/
+
 void calibration(const Int_t prun=pedrun, const Int_t crun1=calrun1, const Int_t crun2=calrun2)
 {
 
   MExtractFixedWindowPeakSearch extractor;
-  extractor.SetRange(0,6,0,6);
+  //  extractor.SetRange(0,14,0,14);
 
-  /*
-  MExtractTimeSpline timeext;
-  timeext.SetRange(0,14,6,14);
-  */
+  // MExtractSlidingWindow  extractor;   
+  // MExtractFixedWindow    extractor;   
+
+  MExtractTimeHighestIntegral timeext;
+
+  // MExtractTimeSpline timeext;
+  // timeext.SetRange(0,14,6,14);
 
   MRunIter pruns;
@@ -137 +135 @@
   calloop.SetRelTimeCalibration();
   calloop.SetExtractor(&extractor);
-  //  calloop.SetArrivalTimeLevel(1);
-  //  calloop.SetTimeExtractor(&timeext);
+  calloop.SetTimeExtractor(&timeext);
   calloop.SetInput(&cruns);
   calloop.SetDisplay(display);

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc

@@ -159 +159 @@
 {
 
+  
   fCam = (MCalibrationCam*)pList->FindObject("MCalibrationRelTimeCam");
   if (!fCam)
@@ -172 +173 @@
     }
   
+
   MArrivalTimeCam *signal = (MArrivalTimeCam*)pList->FindObject("MArrivalTimeCam");
   if (!signal)
@@ -193 +195 @@
       }
   }
-  
   
   if (fLoGainArray->GetEntries()==0)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -39 +39 @@
 //
 // Different signal extractors can be set with the command SetExtractor()
-// Only extractor deriving from MExtractor can be set, default is MExtractSlidingWindow
+// Only extractors deriving from MExtractor can be set, default is MExtractSlidingWindow
+//
+// Different arrival time extractors can be set with the command SetTimeExtractor()
+// Only extractors deriving from MTimeExtractor can be set, default is MExtractTimeSpline
 //
 // At the end of the eventloop, plots and results are displayed, depending on 
@@ -116 +119 @@
 #include "MBadPixelsMerge.h"
 #include "MBadPixelsCam.h"
+#include "MTimeExtractor.h"
 #include "MExtractor.h"
 #include "MExtractPINDiode.h"
 #include "MExtractBlindPixel.h"
 #include "MExtractSlidingWindow.h"
+#include "MExtractTimeSpline.h"
 #include "MFCosmics.h"
 #include "MContinue.h"
@@ -139 +144 @@
 // Default constructor. 
 //
-// Sets fRuns to 0, fExtractor to NULL, fColor to kNONE, fDisplay to kNormalDisplay, 
-// fRelTime to kFALSE, fDataCheck to kFALSE
+// Sets fRuns to 0, fExtractor to NULL, fTimeExtractor to NULL, fColor to kNONE, 
+// fDisplay to kNormalDisplay, fRelTime to kFALSE, fDataCheck to kFALSE
 //
 MJCalibration::MJCalibration(const char *name, const char *title) 
-    : fRuns(0), fExtractor(NULL), fColor(MCalibrationCam::kNONE), fDisplayType(kNormalDisplay),
-      fRelTimes(kFALSE), fDataCheck(kFALSE), fArrivalTimeLevel(2)
+    : fRuns(0), fExtractor(NULL), fTimeExtractor(NULL), 
+      fColor(MCalibrationCam::kNONE), fDisplayType(kNormalDisplay),
+      fRelTimes(kFALSE), fDataCheck(kFALSE)
 {
   fName  = name  ? name  : "MJCalibration";
@@ -761 +767 @@
 //   5)  MExtractPINDiode
 //   6)  MExtractBlindPixel
-//   7)  MArrivalTimeCalc, MArrivalTimeCalc2, depending on fArrivalTimeLevel (only if flag fRelTimes is chosen)
+//   7)  MTimeExtractor (only if flag fRelTimes is chosen)
 //   8)  MContinue(MFCosmics)
 //   9)  MFillH("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode")
@@ -833 +839 @@
   MExtractBlindPixel       blindext;
   MExtractSlidingWindow    extract2;
-  MArrivalTimeCalc         tmecalc1;
-  MArrivalTimeCalc2        tmecalc2;
+  MExtractTimeSpline       timespline;
   MCalibrationChargeCalc   calcalc;
   
@@ -879 +884 @@
     {
       plist.AddToList(&fRelTimeCam);
-      if (fArrivalTimeLevel <= 1)
-        tlist.AddToList(&tmecalc1);
-      else if (fArrivalTimeLevel == 2) 
-        tlist.AddToList(&tmecalc2);
+
+      if (fTimeExtractor)
+        tlist.AddToList(fTimeExtractor);
       else
         {
-          *fLog << err << GetDescriptor() 
-                << ": No valid Signal ArrivalTime Level has been chosen, have only: " << fArrivalTimeLevel 
-                << " aborting..." << endl;
-          return kFALSE;
+          *fLog << warn << GetDescriptor() 
+                << ": No extractor has been chosen, take default MTimeExtractSpine " << endl;
+          tlist.AddToList(&timespline);
         }
     }
@@ -900 +903 @@
   if (fRelTimes)
     tlist.AddToList(&filltme);
-  
+
   // Create and setup the eventloop
   MEvtLoop evtloop(fName);

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -22 +22 @@
 class MPedestalCam;
 class MExtractor;
+class MTimeExtractor;
 class MJCalibration : public MParContainer, public MGCamDisplays
 {
@@ -30 +31 @@
   TString fOutputPath;                                     // Path to the output files
   
-  MRunIter   *fRuns;                                       // Calibration files
-  MExtractor *fExtractor;                                  // Signal extractor
+  MRunIter       *fRuns;                                   // Calibration files
+  MExtractor     *fExtractor;                              // Signal extractor
+  MTimeExtractor *fTimeExtractor;                          // Arrival Time extractor
   
   MBadPixelsCam          fBadPixels;                       // Bad Pixels cam, can be set from previous runs
@@ -46 +48 @@
   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 fArrivalTimeLevel;                                // Level arr. time extractor (e.g. MArrivalTimeCalc2)
   
   void   DisplayResult(MParList &plist);
@@ -69 +70 @@
   void SetBadPixels(const MBadPixelsCam &bad)     { bad.Copy(fBadPixels);   }
   void SetExtractor(MExtractor* ext)              { fExtractor = ext; }
+  void SetTimeExtractor(MTimeExtractor* ext)       { fTimeExtractor = ext; }
   void SetQECam    (const MCalibrationQECam &qe) { qe.Copy(fQECam);        }    
   void SetColor    (const MCalibrationCam::PulserColor_t color) { fColor = color; }
@@ -83 +85 @@
   void SetDataCheck         (const Bool_t b=kTRUE) { fDataCheck        = b; SetDataCheckDisplay(); }
 
-  // Extractors
-  void SetArrivalTimeLevel  (const UInt_t i=1    ) { fArrivalTimeLevel = i; }  
-  
   Bool_t ReadCalibrationCam();
   Bool_t ProcessFile( MPedestalCam &pedcam );

trunk/MagicSoft/Mars/msignal/Makefile

@@ -50 +50 @@
            MTimeExtractor.cc \
            MExtractTimeSpline.cc \
+           MExtractTimeHighestIntegral.cc \
            MArrivalTime.cc \
            MArrivalTimeCalc.cc \

trunk/MagicSoft/Mars/msignal/SignalLinkDef.h

@@ -24 +24 @@
 #pragma link C++ class MTimeExtractor+;
 #pragma link C++ class MExtractTimeSpline+;
+#pragma link C++ class MExtractTimeHighestIntegral+;
 #pragma link C++ class MArrivalTimeCam;
 #pragma link C++ class MArrivalTimePix;