Changeset 3709 for trunk

Timestamp:

04/11/04 18:17:20 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• htmldoc/images/CalibClasses.gif (added)
• macros/calibClasses.C (added)
• mjobs/MJCalibration.cc (modified) (1 diff)
• mjobs/MJCalibration.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
    * macros/dohtml.C
      - included directory mjobs
+
+   * mjobs/MJCalibration.[h,cc]
+     - added and updated documentation (not yet ready)
+
+   * htmldoc/images/CalibClasses.gif
+     - scheme of the calibration classes, used for documentation in 
+       MJCalibration.cc
 
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -28 +28 @@
 //  MJCalibration
 //
+//Begin_Html
+/*
+<img src="images/CalibClasses.gif">
+*/
+//End_Html
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MJCalibration.h"

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -4 +4 @@
 #ifndef MARS_MCalibrationChargeCam
 #include "MCalibrationChargeCam.h"
+#endif
+#ifndef MARS_MCalibrationQECam
+#include "MCalibrationQECam.h"
 #endif
 #ifndef MARS_MBadPixelsCam
@@ -15 +18 @@
 class MParList;
 class MPedestalCam;
-
 class MJCalibration : public MParContainer
 {
 private:
-    TString fOutputPath;
 
-    MRunIter *fRuns;
+  TString fOutputPath;                                     // Path to the output files
+  
+  MRunIter *fRuns;                                         // Calibration files
+  
+  MCalibrationChargeCam fCalibrationCam;                   // Calibration conversion factors FADC2Phe
+  MCalibrationQECam     fQECam;                            // Quantum efficiency, can be set from previous runs
+  MBadPixelsCam         fBadPixels;                        // Bad Pixels cam, can be set from previous runs
+  
+  void DrawProjection   ( MHCamera *obj, Int_t fit) const; // Draw projection of pixels values
+  void DrawRadialProfile( MHCamera *obj)            const; // Draw projection of pixels values onto camera radius
+  void CamDraw(TCanvas &c, const Int_t x, const Int_t y, const MHCamera &cam1,
+               const Int_t fit, const Int_t rad=0);        // Draw histograms into the MStatusDisplay
+  
+  void   DisplayResult(MParList &plist);
+  Bool_t WriteResult();
+  
+public:
 
-    MCalibrationChargeCam fCalibrationCam;
-    MBadPixelsCam         fBadPixels;
-
-    void DrawProjection  ( MHCamera *obj, Int_t fit) const;
-    void DrawRadialProfile( MHCamera *obj)            const;    
-    void CamDraw(TCanvas &c, const Int_t x, const Int_t y, const MHCamera &cam1,
-                 const Int_t fit, const Int_t rad=0);
-
-    void   DisplayResult(MParList &plist);
-    Bool_t WriteResult();
-
-public:
-    MJCalibration(const char *name=NULL, const char *title=NULL);
-
-    void SetInput(MRunIter *iter) { fRuns=iter; }
-    void SetOutputPath(const char *path=".");
-
-    TString GetOutputFile() const;
-
-    MCalibrationChargeCam &GetCalibrationCam() { return fCalibrationCam; }
-    const MBadPixelsCam &GetBadPixels() const { return fBadPixels; }
-
-    void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
-
-    Bool_t ReadCalibrationCam();
-    Bool_t ProcessFile(MPedestalCam &pedcam);
-    Bool_t Process(MPedestalCam &pedcam);
-
-    ClassDef(MJCalibration, 0) // Tool to create a pedestal file (MPedestalCam)
+  MJCalibration(const char *name=NULL, const char *title=NULL);
+  
+  void SetInput(MRunIter *iter) { fRuns=iter; }
+  void SetOutputPath(const char *path=".");
+  
+  TString GetOutputFile() const;
+  
+  MCalibrationChargeCam &GetCalibrationCam()     { return fCalibrationCam; }
+  MCalibrationQECam     &GetQECam()              { return fQECam;          }    
+  const MBadPixelsCam   &GetBadPixels() const    { return fBadPixels;      }
+  
+  void SetBadPixels(const MBadPixelsCam &bad)    { bad.Copy(fBadPixels);   }
+  void SetQECam    (const MCalibrationQECam &qe) { qe.Copy(fQECam);        }    
+  
+  Bool_t ReadCalibrationCam();
+  Bool_t ProcessFile( MPedestalCam &pedcam );
+  Bool_t Process    ( MPedestalCam &pedcam );
+  
+  ClassDef(MJCalibration, 0) // Tool to create a calibration file (MCalibrationCam)
 };