Changeset 4199 for trunk


Ignore:
Timestamp:
05/26/04 18:26:55 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r4198 r4199  
    3131
    3232   * mcalib/MCalibrationQEPix.cc
     33   * mcalib/MCalibrationChargeCalc.cc
    3334     - several small bugs fixed concerning calibration with the blind pixel
    3435       or the PIN Diode

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.cc

    r3698 r4199  
    412412
    413413  *fLog << inf << endl;
    414   *fLog << inf << " Photon flux [ph/mm^2] inside Plexiglass: "
     414  *fLog << inf << GetDescriptor()
     415        << ": Photon flux [ph/mm^2] inside Plexiglass: "
    415416        << Form("%5.3f%s%5.3f",fFluxInsidePlexiglass," +- ",GetFluxInsidePlexiglassErr()) << endl;
    416417

  • trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc

    r4161 r4199  
    10991099    return kFALSE;
    11001100
    1101   weightedav /= sumweights;
    1102 
    1103   fAvNormBlindPixel     = gkDefaultAverageQE   *  weightedav;
    1104   fAvNormBlindPixelVar  = GetAverageQERelVar() + (sumweights / weightedav / weightedav ); 
    1105   fAvNormBlindPixelVar *= fAvNormBlindPixel * fAvNormBlindPixel;
     1101  fAvNormBlindPixel     = weightedav / sumweights;
     1102  fAvNormBlindPixelVar  = 1./ sumweights ;
     1103
     1104  SetAverageQEBlindPixelAvailable();
    11061105
    11071106  return kTRUE;
    … …  
    11261125    return kFALSE;
    11271126
    1128   weightedav /= sumweights;
    1129 
    1130   fAvNormCombined     = gkDefaultAverageQE   *  weightedav;
    1131   fAvNormCombinedVar  = GetAverageQERelVar() + (sumweights / weightedav / weightedav ); 
    1132   fAvNormCombinedVar *= fAvNormCombined * fAvNormCombined;
     1127  fAvNormCombined     = weightedav / sumweights;
     1128  fAvNormCombinedVar  = 1./ sumweights ;
     1129
     1130  SetAverageQECombinedAvailable();
    11331131
    11341132  return kTRUE;
    … …  
    11821180    return kFALSE;
    11831181
    1184   weightedav /= sumweights;
    1185 
    1186   fAvNormPINDiode     = gkDefaultAverageQE   *  weightedav;
    1187   fAvNormPINDiodeVar  = GetAverageQERelVar() + (sumweights / weightedav / weightedav ); 
    1188   fAvNormPINDiodeVar *= fAvNormPINDiode * fAvNormPINDiode;
     1182  fAvNormPINDiode     = weightedav / sumweights;
     1183  fAvNormPINDiodeVar  = 1./ sumweights ;
     1184
     1185  SetAverageQEPINDiodeAvailable();
    11891186
    11901187  return kTRUE;
Note: See TracChangeset for help on using the changeset viewer.