Changeset 3937

Timestamp:

05/03/04 13:41:03 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbadpixels/MBadPixelsPix.cc (modified) (5 diffs)
• mcalib/MCalibrationRelTimeCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc

@@ -64 +64 @@
 // could be calibrated.
 //
-// Two additional functions yield specific calibration information:
-// * IsCalibrationSignalOK() asks if the extracted calibration signal showed any inconsistency
-// * IsCalibrationResultOK() asks if the applied calibration can be used at all.
+// The third index (fInfo[2]) holds information about possible hardware mulfunctionning. The bits 
+// are coded in the following form:
+// BIT(1 ): kHVNotNominal :  The HV deviates more than 3% from the nominal value.
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -87 +87 @@
 //
 MBadPixelsPix::MBadPixelsPix(const char* name, const char* title)
-    : fInfo(5)
+    : fInfo(3)
 {
     fName  = name  ? name  : "MBadPixelsPix";
     fTitle = title ? title : "Container storing bad pixel information for a single pixel";
 
+    fInfo[0] = 0;
     fInfo[1] = 0;
+    fInfo[2] = 0;
+
+    //    memset(&fInfo,0,3*sizeof(Int_t));
 }
 
@@ -121 +125 @@
 void MBadPixelsPix::Merge(const MBadPixelsPix &pix)
 {
-    const Int_t n = pix.fInfo.GetSize();
-    if (n>fInfo.GetSize())
-        fInfo.Set(n);
-
-    for (int i=0; i<n; i++)
-        fInfo[i] |= pix.fInfo[i];
+  const Int_t n = pix.fInfo.GetSize();
+  if (n>fInfo.GetSize())
+    fInfo.Set(n);
+  
+  for (int i=0; i<n; i++)
+    fInfo[i] |= pix.fInfo[i];
 }
 
@@ -156 +160 @@
 
 /*
- MCalibrationCalc - valid for the result of a calibration run:
-
-      3  Hi-Gain saturated, no LoGain available
-
-      4  Conversion Factor HiGain - LoGain not valid
-
-      5  Cannot be calibrated at all
-      6  Cannot be fitted - calibrated using Histogram Mean and RMS
-
-     */
-
-/*
 
 Hardware defects which cannot be detected automatically by software. This might be stored at least in the data-base. I think we should wait until we implement these things...
@@ -182 +174 @@
 Pixel out of L1T. (this is an important information, but not necessarily a defect, is it?)
 
-In addition here are some cases which I think can be detected by software:
-- no signal
-- wrong signal
-- hv problem
-- dc problem
-- Conversion Factor HiGain - LoGain not valid (what does this mean?)
-- No calibration possible
-- No fit possible - calibrated using Histogram Mean and RMS
-- Mean Charge smaller than PedRMS
-- Sigma Charge smaller than PedRMS
-- Calib.methods inconsistency (there are in pricipal 6 combinations... do we need 6 bits?)
-- Gains oscillate (what does it mean?)
-- Sigma  Arrival Time  bigger than  FADC window (from calib)
-- Mean   Arrival Time  at edge of   FADC window (from calib)
 */

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -317 +317 @@
       areasum [aidx] /= numareavalid[aidx];
       areasum2[aidx] /= (numareavalid[aidx]-1.);
-      lowlim  [aidx]  = areamean[aidx] - fRelTimeRelErrLimit*areasum2[aidx];
-      upplim  [aidx]  = areamean[aidx] + fRelTimeRelErrLimit*areasum2[aidx];
+      lowlim  [aidx]  = areasum [aidx] - fRelTimeRelErrLimit*areasum2[aidx];
+      upplim  [aidx]  = areasum [aidx] + fRelTimeRelErrLimit*areasum2[aidx];
     }