Changeset 4203 for trunk/MagicSoft

Timestamp:

05/26/04 19:29:12 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeBlindPix.cc (modified) (3 diffs)
• MCalibrationQECam.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.cc

@@ -376 +376 @@
     {
     case MCalibrationCam::kGREEN:
-      fFluxInsidePlexiglass    = fLambda * gkBlindPixelQEGreen * TMath::Power(10,gkBlindPixelAttGreen);   
+      fFluxInsidePlexiglass    = fLambda / gkBlindPixelQEGreen * TMath::Power(10,gkBlindPixelAttGreen);   
       // attenuation has negligible error
       fFluxInsidePlexiglassVar = GetLambdaRelVar() + GetBlindPixelQEGreenRelVar();
       break;
     case MCalibrationCam::kBLUE:
-      fFluxInsidePlexiglass    = fLambda * gkBlindPixelQEBlue * TMath::Power(10,gkBlindPixelAttBlue);   
+      fFluxInsidePlexiglass    = fLambda / gkBlindPixelQEBlue * TMath::Power(10,gkBlindPixelAttBlue);   
       // attenuation has negligible error
       fFluxInsidePlexiglassVar = GetLambdaRelVar() + GetBlindPixelQEBlueRelVar();
       break;
     case MCalibrationCam::kUV:
-      fFluxInsidePlexiglass    = fLambda * gkBlindPixelQEUV * TMath::Power(10,gkBlindPixelAttUV);   
+      fFluxInsidePlexiglass    = fLambda / gkBlindPixelQEUV * TMath::Power(10,gkBlindPixelAttUV);   
       // attenuation has negligible error
       fFluxInsidePlexiglassVar = GetLambdaRelVar() + GetBlindPixelQEUVRelVar();
@@ -392 +392 @@
     case MCalibrationCam::kCT1:
     default:
-      fFluxInsidePlexiglass    = fLambda * gkBlindPixelQECT1 * TMath::Power(10,gkBlindPixelAttCT1);   
+      fFluxInsidePlexiglass    = fLambda / gkBlindPixelQECT1 * TMath::Power(10,gkBlindPixelAttCT1);   
       // attenuation has negligible error
       fFluxInsidePlexiglassVar = GetLambdaRelVar() + GetBlindPixelQECT1RelVar();
@@ -398 +398 @@
     }
 
+  fFluxInsidePlexiglass    /= gkBlindPixelArea;
+
   //
   // Finish calculation of errors -> convert from relative variance to absolute variance

trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.cc

@@ -238 +238 @@
     {
     case 0:
+      if (!pix.IsAverageQEFFactorAvailable())
       val = pix.GetQECascadesFFactor();
       break;
     case 1:
+      if (!pix.IsAverageQEFFactorAvailable())
       val = pix.GetQECascadesFFactorErr();
       break;