Changeset 3077 for trunk/MagicSoft


Ignore:
Timestamp:
02/09/04 23:40:34 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3076 r3077  
    1919    - take all pixel areas out of MGeomPix::GetA(), remove all previous
    2020      areas
     21    - calculate photon fluxes from blind pixel and PIN diode, use
     22      area only to fill the conversion factors in MCalibrationPix
     23
     24
     25  * mcalib/MJCalibration.cc
     26    - display of number of photons for Blindpixel and PIN Diode Method
     27      changed to display of photon flux which is the actually
     28      calculated quantity
    2129
    2230

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

    r3075 r3077  
    6161const Int_t   MCalibrationCam::gkBlindPixelId   =  559;
    6262const Int_t   MCalibrationCam::gkPINDiodeId     = 9999;
     63const Float_t MCalibrationCam::gkBlindPixelArea = 100;
     64const Float_t MCalibrationCam::gkPINDiodeArea   = 100;
    6365
    6466// --------------------------------------------------------------------------
    … …  
    311313                << pix->GetPedRms() << " Reduced Charge: " << pix->GetCharge() << " +- "
    312314                << pix->GetSigmaCharge() << " Reduced Sigma: " << pix->GetRSigmaCharge() << endl;
    313           Float_t area = (*fGeomCam)[pix->GetPixId()].GetA();
    314           *fLog << "Area: " << area << endl;
    315315          pix->DrawClone();
    316316          id++;
    … …  
    406406    return kFALSE;
    407407
    408   Float_t area = cam[idx].GetA()/100.;
     408  Float_t area = cam[idx].GetA();
    409409
    410410 if (area == 0)
    … …  
    695695  // Start calculation of number of photons
    696696  //
    697   // The blind pixel has exactly one cm^2 area (with negligible error),
    698   // thus we omit division by 1.
     697  // The blind pixel has exactly 100 mm^2 area (with negligible error),
    699698  //
    700   fMeanFluxInsidePlexiglass    = mean;
     699  fMeanFluxInsidePlexiglass    = mean*gkBlindPixelArea;
    701700
    702701  // Start calculation of number of photons relative Variance (!!)
    … …  
    741740
    742741  *fLog << inf << endl;
    743   *fLog << inf << " Photon flux [ph/cm^2] inside Plexiglass: "
     742  *fLog << inf << " Photon flux [ph/mm^2] inside Plexiglass: "
    744743        << fMeanFluxInsidePlexiglass << endl;
    745744
    … …  
    764763  fMeanFluxErrInsidePlexiglass *= fMeanFluxInsidePlexiglass;
    765764
    766   *fLog << inf << " Error on photon flux [ph/cm^2] inside Plexiglass: "
     765  *fLog << inf << " Error on photon flux [ph/mm^2] inside Plexiglass: "
    767766        << fMeanFluxErrInsidePlexiglass << endl;
    768767  *fLog << inf << endl;
    … …  
    779778
    780779          const Float_t charge    = pix->GetCharge();
    781           const Float_t area      = (*fGeomCam)[idx].GetA()/100.;
     780          const Float_t area      = (*fGeomCam)[idx].GetA();
    782781          const Float_t chargeerr = pix->GetErrCharge();         
    783782
    … …  
    815814  const Float_t merr = fPINDiode->GetErrCharge();
    816815
    817   // Start calculation of number of photons
    818   fMeanFluxOutsidePlexiglass = mean * gkCalibrationFluxCameravsPINDiode;
     816  // Start calculation of number of photons per mm^2 on the camera
     817  fMeanFluxOutsidePlexiglass  = mean * gkPINDiodeArea;
     818  // Correct for the distance between camera and PIN Diode and for different areas.
     819  fMeanFluxOutsidePlexiglass *= gkCalibrationFluxCameravsPINDiode;
    819820
    820821  // Start calculation of number of photons relative Variance (!!)
    … …  
    850851
    851852  *fLog << inf << endl;
    852   *fLog << inf << " Mean Photon flux [ph/cm^2] outside Plexiglass: "
     853  *fLog << inf << " Mean Photon flux [ph/mm^2] outside Plexiglass: "
    853854        << fMeanFluxOutsidePlexiglass << endl;
    854855
    … …  
    873874  fMeanFluxErrOutsidePlexiglass *= fMeanFluxOutsidePlexiglass;
    874875
    875   *fLog << inf << " Error on Photon flux [ph/cm^2] outside Plexiglass: "
     876  *fLog << inf << " Error on Photon flux [ph/mm^2] outside Plexiglass: "
    876877        << fMeanFluxErrOutsidePlexiglass << endl;
    877878  *fLog << inf << endl;
    … …  
    888889
    889890          const Float_t charge    = pix->GetCharge();
    890           const Float_t area      = (*fGeomCam)[idx].GetA()/100.;
     891          const Float_t area      = (*fGeomCam)[idx].GetA();
    891892          const Float_t chargeerr = pix->GetErrCharge();         
    892893

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

    r3075 r3077  
    2323  static const Int_t   gkBlindPixelId;
    2424  static const Int_t   gkPINDiodeId;
     25  static const Float_t gkBlindPixelArea;       // The Blind Pixel area in mm^2
     26  static const Float_t gkPINDiodeArea;         // The Blind Pixel area in mm^2 
    2527
    2628  Int_t fNumPixels;

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

    r3075 r3077  
    4444// Area of Inner Pixel w.r.t. PIN Diode (which is 1 cm²)
    4545//
    46 // Hexagone of diagonal axis b = 3.5 cm
    47 //             straight axis a = 3.0 cm +- 2%
    48 // Area =  sqrt(3)*a*a/2 = 7.79 sq.cm +- 4% = 7.8 +- 0.3 sq.cm
    49 //
    5046// Distance of PIN Diode to pulser D1:   1.5  +- 0.3 m
    5147// Distance of Inner Pixel to pulser D2: 18.0 +- 0.5 m
    5248//
    5349//
    54 //                A(Inner Pixel)    D1*D1
    55 // conversion C = -------------- * ------ = 0.054
    56 //                A(PIN Diode)      D2*D2
     50//                D1*D1
     51// conversion C = ------ = 0.0069
     52//                D2*D2
    5753//
    58 // Delta C / C  = sqrt((Delta A(IP)/A(IP))² + 4 * ( (Delta D1/D1)² + (Delta D2/D2)² )
     54// Delta C / C  = 2 * Sqrt( (Delta D1/D1)² + (Delta D2/D2)² )
    5955// Delta C / C  = 0.4
    6056//
    61 // C = 0.05 +- 0.02
     57// C = 0.007 +- 0.003
    6258//
    63 const Float_t gkCalibrationFluxCameravsPINDiode      = 0.05;
    64 const Float_t gkCalibrationFluxCameravsPINDiodeError = 0.02;
     59const Float_t gkCalibrationFluxCameravsPINDiode      = 0.007;
     60const Float_t gkCalibrationFluxCameravsPINDiodeError = 0.003;
    6561
    6662//

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r3069 r3077  
    212212    MHCamera disp7  (geomcam, "Cal;FFactorConv",    "Conversion Factor (F-Factor Method)");
    213213    MHCamera disp8  (geomcam, "Cal;FFactorFFactor", "Total F-Factor (F-Factor Method)");
    214     MHCamera disp9  (geomcam, "Cal;BlindPixPh",     "Nr. of Photons inside plexiglass (Blind Pixel Method)");
     214    MHCamera disp9  (geomcam, "Cal;BlindPixPh",     "Photon flux inside plexiglass (Blind Pixel Method)");
    215215    MHCamera disp10 (geomcam, "Cal;BlindPixConv",   "Conversion Factor (Blind Pixel Method)");
    216216    MHCamera disp11 (geomcam, "Cal;BlindPixFFactor","Total F-Factor (Blind Pixel Method)");
    217     MHCamera disp12 (geomcam, "Cal;PINDiodePh",     "Nr. of Photons outside plexiglass (PIN Diode Method)");
     217    MHCamera disp12 (geomcam, "Cal;PINDiodePh",     "Photons flux outside plexiglass (PIN Diode Method)");
    218218    MHCamera disp13 (geomcam, "Cal;PINDiodeConv",   "Conversion Factor (PIN Diode Method)");
    219219    MHCamera disp14 (geomcam, "Cal;PINDiodeFFactor","Total F-Factor (PIN Diode Method)");
    … …  
    284284    disp8.SetYTitle("\\sqrt{N_{PhE}}*\\sigma_{Charge}/\\mu_{Charge} [1]");
    285285
    286     disp9.SetYTitle("Nr. Photons [1]");
     286    disp9.SetYTitle("Photon flux [ph/mm^2]");
    287287    disp10.SetYTitle("Conversion Factor [Phot/FADC Count]");
    288288    disp11.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1]");
    289289
    290     disp12.SetYTitle("Nr. Photons [1]");
     290    disp12.SetYTitle("Photon flux [ph/mm^2]");
    291291    disp13.SetYTitle("Conversion Factor [Phot/FADC Count]");
    292292    disp14.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1]");
Note: See TracChangeset for help on using the changeset viewer.