Changeset 3445 for trunk/MagicSoft/Mars/mjobs

Timestamp:

03/09/04 14:36:31 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (2 diffs)
• MJCalibration.h (modified) (1 diff)
• MJExtractSignal.h (modified) (1 diff)
• MJPedestal.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -508 +508 @@
     MCalibrationChargeCalc   calcalc;
 
-    MFillH fillpin(  "MHCalibrationChargePINDiode" , "MExtractedSignalPINDiode"   );
-    MFillH fillblind("MHCalibrationChargeBlindPix" , "MExtractedSignalBlindPixel" );
-    MFillH fillcam  ("MHCalibrationChargeCam"      , "MExtractedSignalCam"        );
+    MFillH fillpin  ("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
+    MFillH fillblind("MHCalibrationChargeBlindPix", "MExtractedSignalBlindPixel");
+    MFillH fillcam  ("MHCalibrationChargeCam",      "MExtractedSignalCam");
     // 
     // Apply a filter against cosmics
@@ -522 +522 @@
 
     tlist.AddToList(&read);
+    tlist.AddToList(&merge);
     tlist.AddToList(&apply);
-    tlist.AddToList(&merge);
     tlist.AddToList(&extract);
     tlist.AddToList(&pinext);  

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -40 +40 @@
     TString GetOutputFile() const;
 
-    const MCalibrationChargeCam &GetCalibrationCam() const { return fCalibrationCam; }
-    const MBadPixelsCam         &GetBadPixels()      const { return fBadPixels; }
+    MCalibrationChargeCam &GetCalibrationCam() { return fCalibrationCam; }
+    const MBadPixelsCam &GetBadPixels() const { return fBadPixels; }
 
-    void SetBadPixels(MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
+    void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
 
     Bool_t ReadCalibrationCam();

trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h

@@ -44 +44 @@
     TString GetOutputFileD() const;
 
-    const MPedPhotCam   &GetPedPhotCam() const { return fPedPhotCam; }
+    MPedPhotCam &GetPedPhotCam() { return fPedPhotCam; }
     const MBadPixelsCam &GetBadPixels()  const { return fBadPixels; }
 
-    void SetBadPixels(MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
+    void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
 
     Bool_t ProcessD(MPedestalCam &pedcam);

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -40 +40 @@
     TString GetOutputFile() const;
 
-    const MPedestalCam  &GetPedestalCam() const { return fPedestalCam; }
-    const MBadPixelsCam &GetBadPixels()   const { return fBadPixels; }
+    MPedestalCam &GetPedestalCam() { return fPedestalCam; }
+    const MBadPixelsCam &GetBadPixels() const { return fBadPixels; }
 
-    void SetBadPixels(MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
+    void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
 
     Bool_t ProcessFile();