Changeset 5017

Timestamp:

09/14/04 20:55:46 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationCam.h (modified) (3 diffs)
• mjobs/MJCalibration.cc (modified) (4 diffs)
• mjobs/MJCalibration.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -43 +43 @@
      - took out FindColor() which is now taken care of by 
        MCalibColorSet
+     - introduced MBadPixelsIntensityCam
 
    * mhcalib/MHGausEvents.cc

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -15 +15 @@
 #endif
 
-class TClonesArray;
+class TObjArray;
 
 class MCalibrationPix;
@@ -44 +44 @@
   PulserColor_t fPulserColor;        // Colour of the pulsed LEDs
 
-  TClonesArray *fPixels;             // Array of MCalibrationPix, one per pixel
-  TClonesArray *fAverageAreas;       // Array of MCalibrationPix, one per pixel area
-  TClonesArray *fAverageSectors;     // Array of MCalibrationPix, one per camera sector
-  TClonesArray *fAverageBadAreas;    // Array of MBadPixelsPix,   one per pixel area
-  TClonesArray *fAverageBadSectors;  // Array of MBadPixelsPix,   one per camera sector
+  TObjArray *fPixels;                //-> Array of MCalibrationPix, one per pixel
+  TObjArray *fAverageAreas;          //-> Array of MCalibrationPix, one per pixel area
+  TObjArray *fAverageSectors;        //-> Array of MCalibrationPix, one per camera sector
+  TObjArray *fAverageBadAreas;       //-> Array of MBadPixelsPix,   one per pixel area
+  TObjArray *fAverageBadSectors;     //-> Array of MBadPixelsPix,   one per camera sector
+
+  virtual void Add(const UInt_t a, const UInt_t b);
+  virtual void AddArea(const UInt_t a, const UInt_t b);
+  virtual void AddSector(const UInt_t a, const UInt_t b);
   
 public:
@@ -97 +101 @@
   void  SetPulserColor         ( const PulserColor_t col=kCT1 )  { fPulserColor = col; }
   
-  ClassDef(MCalibrationCam, 4)  // Base class Container for Calibration Results Camera
+  ClassDef(MCalibrationCam, 5)  // Base class Container for Calibration Results Camera
 };
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1432 +1432 @@
 
       MCalibrationBlindCamOneOldStyle blindresults;
-      blindresults.Copy(fCalibrationBlindCam);
+      if (IsIntensity())
+        blindresults.Copy(*fIntensBlindCam.GetCam());
+      else
+        blindresults.Copy(fCalibrationBlindCam);
 
       blindext.SetExtractionType(MExtractBlindPixel::kIntegral);
@@ -1443 +1446 @@
 
       MCalibrationBlindCamTwoNewStyle blindresults;
-      blindresults.Copy(fCalibrationBlindCam);
+
+      if (IsIntensity())
+        blindresults.Copy(*fIntensBlindCam.GetCam());
+      else
+        blindresults.Copy(fCalibrationBlindCam);
 
       blindext.SetNumBlindPixels(blindresults.GetSize());
@@ -1579 +1586 @@
         //        plist.AddToList(&fIntensCalibrationPINDiode);
         plist.AddToList(&fIntensRelTimeCam);
+        plist.AddToList(&fIntensBadCam);
       }
     else
@@ -1964 +1972 @@
     if (IsIntensity())
       {
+        *fLog << inf << " - MBadPixelsIntensityCam..." << flush;
+        if (fIntensBadCam.Write()<=0)
+          {
+            *fLog << err << "Unable to write MBadPixelsIntensityCam to " << oname << endl;
+            return kFALSE;
+          }
+        *fLog << inf << "ok." << endl;
+
         *fLog << inf << " - MCalibrationIntensityChargeCam..." << flush;
         if (fIntensCalibCam.Write()<=0)

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -31 +31 @@
 #ifndef MARS_MCalibrationQECam
 #include "MCalibrationQECam.h"
+#endif
+#ifndef MARS_MBadPixelsIntensityCam
+#include "MBadPixelsIntensityCam.h"
 #endif
 #ifndef MARS_MBadPixelsCam
@@ -82 +85 @@
   MExtractTime   *fTimeExtractor;                       // Arrival Time extractor
   
-  MBadPixelsCam                   fBadPixels;           // Bad Pixels cam, can be set from previous runs
+  MBadPixelsIntensityCam          fIntensBadCam;        // Bad Pixels cam, can be set from previous runs
+  MBadPixelsCam                   fBadPixels;           // Bad Pixels cam, can be set from previous runs  
   MCalibrationIntensityChargeCam  fIntensCalibCam;      // Calibration conversion factors FADC2Phe for diff. intens.
   MCalibrationChargeCam           fCalibrationCam;      // Calibration conversion factors FADC2Phe  
@@ -143 +147 @@
   MCalibrationIntensityRelTimeCam &GetIntensRelTimeCam()     { return fIntensRelTimeCam; }
   MCalibrationIntensityQECam      &GetIntensQECam()          { return fIntensQECam;      }
+  MBadPixelsIntensityCam          &GetIntensBadCam()         { return fIntensBadCam;     }  
 
   MCalibrationChargeCam           &GetCalibrationCam()       { return fCalibrationCam;   }