Changeset 3943 for trunk/MagicSoft/Mars/mjobs

Timestamp:

05/03/04 15:22:08 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (6 diffs)
• MJCalibration.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -42 +42 @@
 //
 // Different arrival time extractors can be set with the command SetTimeExtractor()
-// Only extractors deriving from MTimeExtractor can be set, default is MExtractTimeSpline
+// Only extractors deriving from MExtractTime can be set, default is MExtractTimeSpline
 //
 // At the end of the eventloop, plots and results are displayed, depending on 
@@ -120 +120 @@
 #include "MBadPixelsMerge.h"
 #include "MBadPixelsCam.h"
-#include "MTimeExtractor.h"
+#include "MExtractTime.h"
 #include "MExtractor.h"
 #include "MExtractPINDiode.h"
@@ -768 +768 @@
 //   5)  MExtractPINDiode
 //   6)  MExtractBlindPixel
-//   7)  MTimeExtractor (only if flag fRelTimes is chosen)
+//   7)  MExtractTime (only if flag fRelTimes is chosen)
 //   8)  MContinue(MFCosmics)
 //   9)  MFillH("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode")
@@ -828 +828 @@
   MCalibrationChargePINDiode pindiode;
   MCalibrationChargeBlindPix blindpix;
-  
+
   plist.AddToList(&pedcam);
   plist.AddToList(&fBadPixels);
@@ -893 +893 @@
         {
           *fLog << warn << GetDescriptor() 
-                << ": No extractor has been chosen, take default MTimeExtractSpine " << endl;
+                << ": No extractor has been chosen, take default MTimeExtractSpline " << endl;
           tlist.AddToList(&timespline);
         }
@@ -925 +925 @@
   
   tlist.PrintStatistics();
+
+  MHCalibrationChargeCam *fllcm = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");
+  (*fllcm)[100].DrawClone();
   
   DisplayResult(plist);

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -22 +22 @@
 class MPedestalCam;
 class MExtractor;
-class MTimeExtractor;
+class MExtractTime;
 class MJCalibration : public MParContainer, public MGCamDisplays
 {
@@ -33 +33 @@
   MRunIter       *fRuns;                                   // Calibration files
   MExtractor     *fExtractor;                              // Signal extractor
-  MTimeExtractor *fTimeExtractor;                          // Arrival Time extractor
+  MExtractTime   *fTimeExtractor;                          // Arrival Time extractor
   
   MBadPixelsCam          fBadPixels;                       // Bad Pixels cam, can be set from previous runs
@@ -70 +70 @@
   void SetBadPixels(const MBadPixelsCam &bad)     { bad.Copy(fBadPixels);   }
   void SetExtractor(MExtractor* ext)              { fExtractor = ext; }
-  void SetTimeExtractor(MTimeExtractor* ext)       { fTimeExtractor = ext; }
+  void SetTimeExtractor(MExtractTime* ext)       { fTimeExtractor = ext; }
   void SetQECam    (const MCalibrationQECam &qe) { qe.Copy(fQECam);        }    
   void SetColor    (const MCalibrationCam::PulserColor_t color) { fColor = color; }