Changeset 5485 for trunk/MagicSoft/Mars

Timestamp:

11/27/04 15:11:29 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mcalib/MCalibrationPedCam.cc (modified) (1 diff)
• mhcalib/MHPedestalCam.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationPedCam.cc

@@ -133 +133 @@
       break;
     case 5:
-      val = (*this)[idx].GetLoGainMean() > 1. ? 0. : (*this)[idx].GetLoGainMean();
+      val = (*this)[idx].GetLoGainMean();
       break;
     case 6:

trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc

@@ -485 +485 @@
       //
       pix.SetLoGainMean    ( fSum[i] / fNumEvents  );
-      pix.SetLoGainSigma   ( TMath::Sqrt( (fSum2[i] - fSum[i]*fSum[i]/fNumEvents) / (fNumEvents-1) ));
+      const Double_t diff = fSum2[i] - fSum[i]*fSum[i]/fNumEvents;
+      pix.SetLoGainSigma   ( diff > 0. ? TMath::Sqrt( diff / (fNumEvents-1) ) : 0.);
       pix.SetLoGainMeanVar ( pix.GetLoGainSigma() * pix.GetLoGainSigma() / fNumEvents  );
       pix.SetLoGainSigmaVar( pix.GetLoGainMeanVar() / 4. );
@@ -532 +533 @@
       if (aevts <= 1)
         continue;
+
       pix.SetLoGainMean ( fAreaSum[j] / aevts  );
-      pix.SetLoGainSigma( TMath::Sqrt( (fAreaSum2[j] - fAreaSum[j]*fAreaSum[j]/aevts) / (aevts-1) ));
+      const Double_t diff = fAreaSum2[j] - fAreaSum[j]*fAreaSum[j]/aevts ;
+      pix.SetLoGainSigma( diff > 0. ? TMath::Sqrt( diff / (aevts-1) ) : 0.);
     }
   
@@ -574 +577 @@
       if (sevts <= 1)
         continue;
-      pix.SetLoGainMean ( fAreaSum[j] / sevts  );
-      pix.SetLoGainSigma( TMath::Sqrt( (fAreaSum2[j] - fAreaSum[j]*fAreaSum[j]/sevts) / (sevts-1) ));
+
+      pix.SetLoGainMean ( fSectorSum[j] / sevts  );
+      const Double_t diff = fSectorSum2[j] - fSectorSum[j]*fSectorSum[j]/sevts ;
+      pix.SetLoGainSigma( diff > 0. ? TMath::Sqrt( diff / (sevts-1) ) : 0.);
     }
 }