Changeset 5128

Timestamp:

09/25/04 12:09:09 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibColorSteer.cc (modified) (4 diffs)
• mcalib/MCalibrationBlindCam.cc (modified) (2 diffs)
• mcalib/MCalibrationBlindCam.h (modified) (1 diff)
• mcalib/MCalibrationBlindCamTwoNewStyle.h (modified) (1 diff)
• mcalib/MCalibrationCam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/09/23: Markus Gaug
+ 
+   * mcalib/MCalibrationBlindCam.[h,cc]
+     - added function SetPulserColor which was only available in 
+       MCalibrationBlindPix. 
+
+
+
  2004/09/23: Abelardo Moralejo
    * mtemp/mpadova/macros/area.C, RanForestPD.C, gammarate.C

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -200 +200 @@
 //
 // Reads the pattern from MRawEvtHeader and initializes new containers in the 
-// Intensity Cams, if the pattern has changed
+// Intensity Cams, if the pattern has changed. Executes CallPostProcess of the 
+// MCalibration*Calc classes in that case.
 //
 Int_t MCalibColorSteer::Process()
@@ -242 +243 @@
   return kTRUE;
 }
+
 
 // --------------------------------------------------------------------------
@@ -359 +361 @@
     number[MCalibrationCam::kCT1]   += 1;
 
-  TString result = "";
+  TString result;
   
   for (Int_t i=0; i<MCalibrationCam::gkNumPulserColors; i++)
@@ -367 +369 @@
         case MCalibrationCam::kGREEN:
           if (number[i] > 0.1)
-            {
-              result += number[i];
-              result += "GREEN";
-            }
+            result = Form("%2.1f%s",number[i],"GREEN");
           break;
         case MCalibrationCam::kBLUE:
           if (number[i] > 0.1)
-            {
-              result += number[i];
-              result += "BLUE";
-            }
+            result = Form("%2.1f%s",number[i],"BLUE");
           break;
         case MCalibrationCam::kUV:
           if (number[i] > 0.1)
-            {
-              result += number[i];
-              result += "UV";
-            }
+            result = Form("%2.1f%s",number[i],"UV");
           break;
         case MCalibrationCam::kCT1:
           if (number[i] > 0.1)
-            result += "CT1";
+            result = Form("%2.1f%s",number[i],"CT1");
           break;
         }

trunk/MagicSoft/Mars/mcalib/MCalibrationBlindCam.cc

@@ -61 +61 @@
 
   InitSize(nblind);
+
 }
 
 void MCalibrationBlindCam::Add(const UInt_t a, const UInt_t b)
 {
+
   for (UInt_t i=a; i<b; i++)
     fPixels->AddAt(new MCalibrationBlindPix,i);
+
 }
 
@@ -184 +187 @@
 
 
+// --------------------------------------------------------------------------
+//
+// Set color to this class and to the MCalibrationBlindPix's
+//
+void  MCalibrationBlindCam::SetPulserColor ( const MCalibrationCam::PulserColor_t col )
+{
+
+  fPulserColor = col;
+  fPixels->ForEach(MCalibrationBlindPix, SetColor)(col);
+
+}

trunk/MagicSoft/Mars/mcalib/MCalibrationBlindCam.h

@@ -26 +26 @@
   Float_t GetFluxInsidePlexiglassVar () const;
   Float_t GetFluxInsidePlexiglassRelVar() const;
+
+  void  SetPulserColor( const MCalibrationCam::PulserColor_t col );
   
   ClassDef(MCalibrationBlindCam, 2) // Container Blind Pixels Calibration Results Camera

trunk/MagicSoft/Mars/mcalib/MCalibrationBlindCamTwoNewStyle.h

@@ -19 +19 @@
 
   MCalibrationBlindCamTwoNewStyle(const char *name=NULL);
-  
+
   ClassDef(MCalibrationBlindCamTwoNewStyle, 1) // Container Blind Pixel Calibration Results - after run 31693
 };

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -44 +44 @@
   PulserColor_t fPulserColor;        // Colour of the pulsed LEDs
 
-  TOrdCollection *fPixels;            // Array of MCalibrationPix, one per pixel
+  TOrdCollection *fPixels;            //-> Array of MCalibrationPix, one per pixel
   TOrdCollection *fAverageAreas;      // Array of MCalibrationPix, one per pixel area
   TOrdCollection *fAverageSectors;    // Array of MCalibrationPix, one per camera sector
@@ -99 +99 @@
   void  SetNumUnsuitable       ( const UInt_t i,  const Int_t aidx   );  
   void  SetNumUnreliable       ( const UInt_t i,  const Int_t aidx   ); 
-  void  SetPulserColor         ( const PulserColor_t col=kCT1 )  { fPulserColor = col; }
+  virtual void  SetPulserColor( const PulserColor_t col=kCT1 )  { fPulserColor = col; }
   
   ClassDef(MCalibrationCam, 5)  // Base class Container for Calibration Results Camera