Changeset 3433 for trunk/MagicSoft

Timestamp:

03/07/04 18:38:54 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbadpixels/MBadPixelsPix.cc (modified) (2 diffs)
• mbadpixels/MBadPixelsPix.h (modified) (1 diff)
• mcalib/MHCalibrationChargeCam.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc

@@ -44 +44 @@
 //
 MBadPixelsPix::MBadPixelsPix(const char* name, const char* title)
-    : fInfo(0)
+    : fInfo(2)
 {
     fName  = name  ? name  : "MBadPixelsPix";
@@ -81 +81 @@
 
     for (int i=0; i<n; i++)
-        fInfo[i] |= pix.fInfo[n];
+        fInfo[i] |= pix.fInfo[i];
 }
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -151 +151 @@
     Bool_t IsCalibrationCombinedMethodOK() const  { return ( IsCalibrationResultOK()
                                                             && (fInfo[1]&kCombinedMethodValid)) ; }
-    
+
     void Merge(const MBadPixelsPix &pix);
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -554 +554 @@
     fCam->GetAverageOuterPix()->SetSigmaChargeErr(fCam->GetAverageOuterPix()->GetSigmaChargeErr()*TMath::Sqrt((Float_t)fNumOuterPixels));
     
-    *fLog << err << TMath::Sqrt((Float_t)fNumInnerPixels) << endl;
-    *fLog << err << TMath::Sqrt((Float_t)fNumOuterPixels) << endl;
-
     return kTRUE;
 }