Changeset 2905

Timestamp:

01/24/04 01:55:16 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mcalib/MCalibrationCam.cc (modified) (2 diffs)
• mcalib/MHCalibrationPINDiode.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -13 +13 @@
    * mcalib/MCalibrationBlindPix.h
    * mcalib/MHCalibrationBlindPixel.[h,cc]
+   * mcalib/MCalibrationPINDiode.h
+   * mcalib/MHCalibrationPINDiode.[h,cc]
    * mcalib/MCalibrationPix.[h,cc]
    * mcalib/MHCalibrationPixel.[h,cc]
@@ -27 +29 @@
      - clean up  setters 
      - pass to bit-fields for all flags
+
+   * mcalib/MCalibrationCam.cc
+     - exclude Blind Pixel from Camera display
+     - do not fill &val when return kFALSE
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -341 +341 @@
     return kFALSE;
 
-  if (!(*this)[idx].IsFitValid())
-    {
-      val = -1.;
-      return kFALSE;
-    }
-  
+  if ( (!(*this)[idx].IsFitValid()) || (*this)[idx].IsExcluded())
+    return kFALSE;
+  
+  if (idx == gkCalibrationBlindPixelId)
+    return kFALSE;
+
   switch (type)
     {
@@ -474 +474 @@
 
   *fLog << inf << endl;
-  *fLog << inf << mean << " Mean number of Photons for an Inner Pixel (inside Plexiglass): " 
+  *fLog << inf << "Mean number of Photons for an Inner Pixel (inside Plexiglass): " 
         << fMeanPhotInsidePlexiglass << endl;
-  *fLog << inf << endl;
 
   TIter Next(fPixels);

trunk/MagicSoft/Mars/mcalib/MHCalibrationPINDiode.cc

@@ -78 +78 @@
     Int_t nbins   = 32;
 
-    fHPTime = new TH1I("HPTime","Distribution of Mean Arrival Times",nbins,tfirst,tlast);
+    fHPTime = new TH1F("HPTime","Distribution of Mean Arrival Times",nbins,tfirst,tlast);
     fHPTime->SetXTitle("Mean Arrival Times [FADC slice nr]");
     fHPTime->SetYTitle("Nr. of events");