Changeset 4967 for trunk/MagicSoft/Mars/mcalib

Timestamp:

09/13/04 10:23:06 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationCam.cc (modified) (1 diff)
• MCalibrationCam.h (modified) (1 diff)
• MCalibrationChargeBlindCam.cc (modified) (1 diff)
• MCalibrationChargeBlindPix.cc (modified) (1 diff)
• MCalibrationChargeCalc.cc (modified) (2 diffs)
• MCalibrationChargeCam.cc (modified) (1 diff)
• MCalibrationIntensityCam.cc (modified) (2 diffs)
• MCalibrationIntensityCam.h (modified) (1 diff)
• MCalibrationIntensityChargeCam.cc (modified) (3 diffs)
• MCalibrationIntensityQECam.cc (modified) (2 diffs)
• MCalibrationIntensityRelTimeCam.cc (modified) (3 diffs)
• MCalibrationQECam.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -115 +115 @@
   //
   // delete fPixels should delete all Objects stored inside
-  // 
+  //
   if (fPixels)
     delete fPixels;

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -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 *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

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindCam.cc

@@ -81 +81 @@
 }
 
-
 // --------------------------------------
 //

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.cc

@@ -140 +140 @@
 
 }
-
 
 // ------------------------------------------------------------------------

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -551 +551 @@
   // The pattern has changed, we have to initialize everything new!!!
   //
-  *fLog << inf << " New pulser pattern: " ;
+  *fLog << inf << GetDescriptor() << "- New pulser pattern: " ;
   for (Int_t i=16; i>= 0; i--)
     *fLog << (pattern >> i & 1);
@@ -562 +562 @@
   fPulserColor = MCalibrationCam::kNONE;
   
-  if (fPulserPattern & kAnyGreen )
-    fPulserColor = MCalibrationCam::kGREEN;
-  
-  if (fPulserPattern & kAnyBlue )
-    if (fPulserColor != MCalibrationCam::kNONE)
-      {
-        *fLog << err << GetDescriptor() 
-              << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl;
-        return kCONTINUE;
-      }
-    else
-      fPulserColor = MCalibrationCam::kBLUE;
-  
-  if (fPulserPattern & kAnyUV )
-    if (fPulserColor != MCalibrationCam::kNONE)
-      {
-        *fLog << err << GetDescriptor() 
-              << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl;
-        return kCONTINUE;
-      }
-    else
-      fPulserColor = MCalibrationCam::kUV;
-  
-  if (fPulserPattern & kCT1Pulser )
-    if (fPulserColor != MCalibrationCam::kNONE)
-      {
-        *fLog << err << GetDescriptor() 
-              << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl;
-        return kCONTINUE;
-      }
-    else
-      fPulserColor = MCalibrationCam::kCT1;
-  
-  *fLog << inf << GetDescriptor() << ": Found new colour ... " << flush;
+  if (fPulserPattern & kAnyGreen)
+      fPulserColor = MCalibrationCam::kGREEN;
+
+  if ((fPulserPattern & kAnyBlue ||
+       fPulserPattern & kAnyUV   ||
+       fPulserPattern & kCT1Pulser) && fPulserColor != MCalibrationCam::kNONE)
+  {
+      *fLog << err << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl;
+      return kCONTINUE;
+  }
+
+  if (fPulserColor == MCalibrationCam::kNONE)
+  {
+      if (fPulserPattern & kAnyBlue)
+          fPulserColor = MCalibrationCam::kBLUE;
+      if (fPulserPattern & kAnyUV)
+          fPulserColor = MCalibrationCam::kUV;
+      if (fPulserPattern & kCT1Pulser)
+          fPulserColor = MCalibrationCam::kCT1;
+  }
+
+  *fLog << inf << "Found new colour ... " << flush;
   
   switch (fPulserColor)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -136 +136 @@
 }
 
-
 // --------------------------------------
 //

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc

@@ -50 +50 @@
 
 using namespace std;
+
 // --------------------------------------------------------------------------
 //
@@ -72 +73 @@
 MCalibrationIntensityCam::~MCalibrationIntensityCam()
 {
-  if (fCams)
-    delete fCams;
+    if (fCams)
+        delete fCams;
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.h

@@ -33 +33 @@
 protected:  
 
-  TClonesArray *fCams;        //-> Array of MCalibrationCams, one per pulse colour and intensity
+  TClonesArray *fCams;        // Array of MCalibrationCams, one per pulse colour and intensity
 
 public:

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc

@@ -46 +46 @@
 
 using namespace std;
+
 // --------------------------------------------------------------------------
 //
@@ -54 +55 @@
 // Creates a TClonesArray of MCalibrationChargeCam containers, initialized to 1 entry, destinated 
 // to hold one container per camera. 
-//
-// Calls:
-// - Clear()
 //
 MCalibrationIntensityChargeCam::MCalibrationIntensityChargeCam(const char *name, const char *title)
@@ -67 +65 @@
   
 }
-

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityQECam.cc

@@ -51 +51 @@
 // Sets all pointers to 0
 // 
-// Creates a TClonesArray of MCalibrationQECam containers, initialized to 1 entry, destinated 
-// to hold one container per camera. 
-//
-// Calls:
-// - Clear()
+// Creates a TClonesArray of MCalibrationQECam containers, initialized
+// to 1 entry, destinated to hold one container per camera.
 //
 MCalibrationIntensityQECam::MCalibrationIntensityQECam(const char *name, const char *title)
@@ -66 +63 @@
 
 }
-

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityRelTimeCam.cc

@@ -45 +45 @@
 
 using namespace std;
+
 // --------------------------------------------------------------------------
 //
@@ -54 +55 @@
 // to hold one container per camera. 
 //
-// Calls:
-// - Clear()
 //
 MCalibrationIntensityRelTimeCam::MCalibrationIntensityRelTimeCam(const char *name, const char *title)
@@ -66 +65 @@
 
 }
-

trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.h

@@ -34 +34 @@
 
   MCalibrationQECam(const char *name=NULL, const char *title=NULL);
-  ~MCalibrationQECam() {}
 
   void Clear( Option_t *o=""  );