Changeset 3243


Ignore:
Timestamp:
02/19/04 21:44:24 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3242 r3243  
    1212     - standardized naming of variables containing "Error", this also affected
    1313       the calling functions MCalibrate, MMcCalibrationUpdate and MCalibrateData
     14
     15   * mcalib/MCalibrationCam.cc
     16   * mcalib/MCalibrationConfig.h
     17     - took out some configuration numbers and put them directly into
     18       the class
    1419
    1520

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

    r3242 r3243  
    141141const Float_t MCalibrationCam::gkBlindPixelArea = 100;
    142142const Float_t MCalibrationCam::gkPINDiodeArea   = 100;
     143// Average QE of Blind Pixel (three colours)
     144const Float_t MCalibrationCam::gkCalibrationBlindPixelQEGreen = 0.154;
     145const Float_t MCalibrationCam::gkCalibrationBlindPixelQEBlue  = 0.226;
     146const Float_t MCalibrationCam::gkCalibrationBlindPixelQEUV    = 0.247;
     147const Float_t MCalibrationCam::gkCalibrationBlindPixelQECT1   = 0.247;
     148// Average QE Error of Blind Pixel (three colours)
     149const Float_t MCalibrationCam::gkCalibrationBlindPixelQEGreenErr = 0.015;
     150const Float_t MCalibrationCam::gkCalibrationBlindPixelQEBlueErr  = 0.02;
     151const Float_t MCalibrationCam::gkCalibrationBlindPixelQEUVErr    = 0.02;
     152const Float_t MCalibrationCam::gkCalibrationBlindPixelQECT1Err   = 0.02;
     153// Attenuation factor Blind Pixel (three colours)
     154const Float_t MCalibrationCam::gkCalibrationBlindPixelAttGreen = 1.97;
     155const Float_t MCalibrationCam::gkCalibrationBlindPixelAttBlue  = 1.96;
     156const Float_t MCalibrationCam::gkCalibrationBlindPixelAttUV    = 1.95;
     157const Float_t MCalibrationCam::gkCalibrationBlindPixelAttCT1   = 1.95;
     158
     159
    143160
    144161// --------------------------------------------------------------------------
    … …  
    841858    case kECGreen:
    842859      fMeanFluxInsidePlexiglass    /= gkCalibrationBlindPixelQEGreen;   
    843       fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEGreenError*gkCalibrationBlindPixelQEGreenError
     860      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEGreenErr*gkCalibrationBlindPixelQEGreenErr
    844861                                    / gkCalibrationBlindPixelQEGreen  /   gkCalibrationBlindPixelQEGreen;   
    845862
    … …  
    849866    case kECBlue:
    850867      fMeanFluxInsidePlexiglass    /= gkCalibrationBlindPixelQEBlue;   
    851       fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEBlueError*gkCalibrationBlindPixelQEBlueError
     868      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEBlueErr*gkCalibrationBlindPixelQEBlueErr
    852869                                    / gkCalibrationBlindPixelQEBlue  /   gkCalibrationBlindPixelQEBlue;   
    853870
    … …  
    857874    case kECUV:
    858875      fMeanFluxInsidePlexiglass    /= gkCalibrationBlindPixelQEUV;   
    859       fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEUVError*gkCalibrationBlindPixelQEUVError
     876      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEUVErr*gkCalibrationBlindPixelQEUVErr
    860877                                    / gkCalibrationBlindPixelQEUV  /   gkCalibrationBlindPixelQEUV;   
    861878
    … …  
    866883    default:
    867884      fMeanFluxInsidePlexiglass    /= gkCalibrationBlindPixelQECT1;   
    868       fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQECT1Error*gkCalibrationBlindPixelQECT1Error
     885      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQECT1Err*gkCalibrationBlindPixelQECT1Err
    869886                                    / gkCalibrationBlindPixelQECT1  /   gkCalibrationBlindPixelQECT1;   
    870887
    … …  
    956973  // Start calculation of number of photons relative Variance (!!)
    957974  fMeanFluxErrOutsidePlexiglass  = merr*merr/mean/mean;
    958   fMeanFluxErrOutsidePlexiglass += gkCalibrationFluxCameravsPINDiodeError*gkCalibrationFluxCameravsPINDiodeError
     975  fMeanFluxErrOutsidePlexiglass += gkCalibrationFluxCameravsPINDiodeErr*gkCalibrationFluxCameravsPINDiodeErr
    959976                                 / gkCalibrationFluxCameravsPINDiode/gkCalibrationFluxCameravsPINDiode;
    960977 
    … …  
    963980    case kECGreen:
    964981      fMeanFluxOutsidePlexiglass    /= gkCalibrationPINDiodeQEGreen;
    965       fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEGreenError*gkCalibrationPINDiodeQEGreenError
     982      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEGreenErr*gkCalibrationPINDiodeQEGreenErr
    966983                                     / gkCalibrationPINDiodeQEGreen/gkCalibrationPINDiodeQEGreen;
    967984      break;
    968985    case kECBlue:
    969986      fMeanFluxOutsidePlexiglass    /= gkCalibrationPINDiodeQEBlue;
    970       fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEBlueError*gkCalibrationPINDiodeQEBlueError
     987      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEBlueErr*gkCalibrationPINDiodeQEBlueErr
    971988                                     / gkCalibrationPINDiodeQEBlue/gkCalibrationPINDiodeQEBlue;
    972989      break;
    973990    case kECUV:
    974991      fMeanFluxOutsidePlexiglass    /= gkCalibrationPINDiodeQEUV;
    975       fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEUVError*gkCalibrationPINDiodeQEUVError
     992      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEUVErr*gkCalibrationPINDiodeQEUVErr
    976993                                     / gkCalibrationPINDiodeQEUV/gkCalibrationPINDiodeQEUV;
    977994      break;
    … …  
    979996    default:
    980997      fMeanFluxOutsidePlexiglass    /= gkCalibrationPINDiodeQECT1;
    981       fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQECT1Error*gkCalibrationPINDiodeQECT1Error
     998      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQECT1Err*gkCalibrationPINDiodeQECT1Err
    982999                                     / gkCalibrationPINDiodeQECT1/gkCalibrationPINDiodeQECT1;
    9831000      break;

  • trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

    r3077 r3243  
    2525  static const Float_t gkBlindPixelArea;       // The Blind Pixel area in mm^2
    2626  static const Float_t gkPINDiodeArea;         // The Blind Pixel area in mm^2 
     27
     28  static const Float_t gkCalibrationBlindPixelQEGreen;
     29  static const Float_t gkCalibrationBlindPixelQEBlue ;
     30  static const Float_t gkCalibrationBlindPixelQEUV   ;
     31  static const Float_t gkCalibrationBlindPixelQECT1  ;
     32
     33  static const Float_t gkCalibrationBlindPixelQEGreenErr;
     34  static const Float_t gkCalibrationBlindPixelQEBlueErr ;
     35  static const Float_t gkCalibrationBlindPixelQEUVErr   ;
     36  static const Float_t gkCalibrationBlindPixelQECT1Err  ;
     37 
     38  static const Float_t gkCalibrationBlindPixelAttGreen;
     39  static const Float_t gkCalibrationBlindPixelAttBlue ;
     40  static const Float_t gkCalibrationBlindPixelAttUV   ;
     41  static const Float_t gkCalibrationBlindPixelAttCT1  ;
    2742
    2843  Int_t fNumPixels;

  • trunk/MagicSoft/Mars/mcalib/MCalibrationConfig.h

    r3192 r3243  
    1111//
    1212/////////////////////////////////////////////////////////////////////////////
    13 // ----- BLIND PIXEL ----------------------//
    14 
    15 // Average QE of Blind Pixel (three colours)
    16 const Float_t gkCalibrationBlindPixelQEGreen = 0.154;
    17 const Float_t gkCalibrationBlindPixelQEBlue  = 0.226;
    18 const Float_t gkCalibrationBlindPixelQEUV    = 0.247;
    19 const Float_t gkCalibrationBlindPixelQECT1   = 0.247;
    20 
    21 // Average QE Error of Blind Pixel (three colours)
    22 const Float_t gkCalibrationBlindPixelQEGreenError = 0.015;
    23 const Float_t gkCalibrationBlindPixelQEBlueError  = 0.02;
    24 const Float_t gkCalibrationBlindPixelQEUVError    = 0.02;
    25 const Float_t gkCalibrationBlindPixelQECT1Error   = 0.02;
    26 
    27 // Attenuation factor Blind Pixel (three colours)
    28 const Float_t gkCalibrationBlindPixelAttGreen = 1.97;
    29 const Float_t gkCalibrationBlindPixelAttBlue  = 1.96;
    30 const Float_t gkCalibrationBlindPixelAttUV    = 1.95;
    31 const Float_t gkCalibrationBlindPixelAttCT1   = 1.95;
    32 
    33 const Float_t gkCalibrationOutervsInnerPixelArea      = 4.0;
    34 const Float_t gkCalibrationOutervsInnerPixelAreaError = 0.2;
    35 
    3613// ----- PIN DIODE ------------------------//
    3714
    … …  
    5330//
    5431const Float_t gkCalibrationFluxCameravsPINDiode      = 0.007;
    55 const Float_t gkCalibrationFluxCameravsPINDiodeError = 0.003;
     32const Float_t gkCalibrationFluxCameravsPINDiodeErr  = 0.003;
    5633
    5734//
    … …  
    6643// Average QE of the PIN Diode
    6744//
    68 const Float_t gkCalibrationPINDiodeQEGreenError = -1.0;
    69 const Float_t gkCalibrationPINDiodeQEBlueError  = -1.0;
    70 const Float_t gkCalibrationPINDiodeQEUVError    = -1.0;
    71 const Float_t gkCalibrationPINDiodeQECT1Error   = -1.0;
     45const Float_t gkCalibrationPINDiodeQEGreenErr = -1.0;
     46const Float_t gkCalibrationPINDiodeQEBlueErr  = -1.0;
     47const Float_t gkCalibrationPINDiodeQEUVErr    = -1.0;
     48const Float_t gkCalibrationPINDiodeQECT1Err   = -1.0;
    7249
    7350#endif /* MARS_MCalibrationConfig */
Note: See TracChangeset for help on using the changeset viewer.