Changeset 6705

Timestamp:

03/02/05 15:26:59 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbadpixels/MBadPixelsCam.cc (modified) (2 diffs)
• mhcalib/MHCalibrationPulseTimeCam.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
    * mjobs/MJCalibrateSignal.[h,cc]
      - put the storage types in the base class
+
+   * mbadpixels/MBadPixelsCam.cc
+     - add some output in case that AsciiRead does not work
 
  2005/02/25 Markus Gaug

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -517 +517 @@
 void MBadPixelsCam::AsciiRead(istream &fin, UInt_t run=0)
 {
+
     Int_t len;
     TString str;
@@ -523 +524 @@
     {
         str.ReadLine(fin);
-        if (!fin)
+
+        if (str.IsNull())
+          {
+            *fLog << warn << GetDescriptor() 
+                  << ": Cannot apply AsciiRead from istream pointer. "
+                  << "Either file does not exist or file is empty! " << endl;
             return;
+          }
 
         Int_t r;

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -148 +148 @@
 const Axis_t  MHCalibrationPulseTimeCam::fgHiGainFirst =  -0.5;
 const Axis_t  MHCalibrationPulseTimeCam::fgHiGainLast  =  19.5;
-const Float_t MHCalibrationPulseTimeCam::fgProbLimit   = 0.0001;
-const Byte_t  MHCalibrationPulseTimeCam::fgLowerSignalLimit = 100;
+const Float_t MHCalibrationPulseTimeCam::fgProbLimit   = 0.001;
+const Byte_t  MHCalibrationPulseTimeCam::fgLowerSignalLimit = 85;
 const TString MHCalibrationPulseTimeCam::gsHistName    = "PulseTime";
 const TString MHCalibrationPulseTimeCam::gsHistTitle   = "Extracted Times";
@@ -329 +329 @@
   fSumhiarea  .Reset(); 
   fSumhisector.Reset(); 
+  fAverageAreaNum.Reset();
+  fAverageSectorNum.Reset();
 
   MRawEvtPixelIter pixel(fRawEvt);
@@ -391 +393 @@
       fSumhiarea[aidx]      += time;
       fSumhisector[sector]  += time;
-
+      
+      fAverageAreaNum[aidx]++;
+      fAverageSectorNum[sector]++;
     }