Changeset 4125 for trunk/MagicSoft/Mars

Timestamp:

05/22/04 14:52:30 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationRelTimeCalc.cc (modified) (9 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
        Allocation (like suggested by TBretz).
 
-   * mcalib/MCalibrationRelTimeCalc.cc
+   * mcalib/MCalibrationRelTimeCalc.[h,cc]
      - replaced the relative limit for acceptance of the time resolution 
        by an absolute limit

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -72 +72 @@
 using namespace std;
 
-const Float_t MCalibrationRelTimeCalc::fgRelTimeRelErrLimit      = 10.;
+const Float_t MCalibrationRelTimeCalc::fgRelTimeResolutionLimit = 1.;
 // --------------------------------------------------------------------------
 //
@@ -80 +80 @@
 // 
 // Initializes:
-// - fRelTimeRelErrLimit to fgRelTimeRelErrimit
+// - fRelTimeResolutionLimit to fgRelTimeResolutionimit
 //
 // Calls:
@@ -92 +92 @@
   fTitle = title ? title : "Task to finalize the relative time calibration";
   
-  SetRelTimeRelErrLimit();
+  SetRelTimeResolutionLimit();
  
   Clear();
@@ -238 +238 @@
 
   PrintUncalibrated(MBadPixelsPix::kDeviatingTimeResolution,    
-                    Form("%s%2.1f%s","Time resolution less than ",fRelTimeRelErrLimit," sigma from Mean:   "));
+                    Form("%s%2.1f%s","Time resolution less than ",fRelTimeResolutionLimit," FADC slices from Mean:   "));
   PrintUncalibrated(MBadPixelsPix::kRelTimeOscillating,   
                     "Pixels with changing Rel. Times   over time:      ");
@@ -254 +254 @@
 //             MBadPixelsPix::kUnreliableRun (see FinalizeBadPixels())
 //              
-// Second loop: Exclude those deviating by more than fRelTimeRelErrLimit mean 
-//              sigmas from the mean (obtained in first loop). Set 
+// Second loop: Exclude those deviating by more than fRelTimeResolutionLimit FADC slices
+//              from the mean (obtained in first loop). Set 
 //              MBadPixelsPix::kDeviatingTimeResolution if excluded.
 // 
@@ -267 +267 @@
   Float_t upplim       [nareas];
   Float_t areasum      [nareas];
-  Float_t areasum2     [nareas];
+  //  Float_t areasum2     [nareas];
   Int_t   numareavalid [nareas];
   Int_t   useunreliable[nareas];
@@ -274 +274 @@
   memset(upplim        ,0, nareas   * sizeof(Float_t));
   memset(areasum       ,0, nareas   * sizeof(Float_t));
-  memset(areasum2      ,0, nareas   * sizeof(Float_t));
+  //  memset(areasum2      ,0, nareas   * sizeof(Float_t));
   memset(numareavalid  ,0, nareas   * sizeof(Int_t  ));
   memset(useunreliable ,0, nareas   * sizeof(Int_t  ));
@@ -325 +325 @@
 
       areasum     [aidx] += res;
-      areasum2    [aidx] += res*res;
+      //      areasum2    [aidx] += res*res;
       numareavalid[aidx] ++;
     }
@@ -340 +340 @@
  
       // Calculate the rms out of sum2:
+      /*
       areasum2[aidx]  = (areasum2[aidx] - areasum[aidx]*areasum[aidx]/numareavalid[aidx]);
       areasum2[aidx] /= (numareavalid[aidx]-1.);
+      */
       areasum [aidx] /= numareavalid[aidx];
       lowlim  [aidx]  = 0.;
-      upplim  [aidx]  = areasum [aidx] + fRelTimeRelErrLimit*areasum2[aidx];
+      upplim  [aidx]  = areasum [aidx] + fRelTimeResolutionLimit;
       
       *fLog << endl;