Changeset 3244 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
02/19/04 21:59:01 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3243 r3244  
    1717     - took out some configuration numbers and put them directly into
    1818       the class
     19     - remove completely MCalibrationConfig.h
    1920
    2021

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

    r3242 r3244  
    4848//////////////////////////////////////////////////////////////////////////////
    4949#include "MCalibrateData.h"
    50 #include "MCalibrationConfig.h"
    5150
    5251#include "MLog.h"

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

    r3234 r3244  
    7979// FXIME: Usage of fstream is a preliminary workaround!
    8080#include <fstream>
    81 
    82 // FXIME: This has to be removed!!!! (YES, WHEN WE HAVE ACCESS TO THE DATABASE!!!!!)
    83 #include "MCalibrationConfig.h"
    8481
    8582#include <TSystem.h>

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

    r3243 r3244  
    127127
    128128#include "MCalibrationPix.h"
    129 #include "MCalibrationConfig.h"
    130129#include "MCalibrationBlindPix.h"
    131130#include "MCalibrationPINDiode.h"
    … …  
    157156const Float_t MCalibrationCam::gkCalibrationBlindPixelAttCT1   = 1.95;
    158157
    159 
     158// ----- PIN DIODE ------------------------//
     159//
     160// Area of Inner Pixel w.r.t. PIN Diode (which is 1 cm2)
     161//
     162// Distance of PIN Diode to pulser D1:   1.5  +- 0.3 m
     163// Distance of Inner Pixel to pulser D2: 18.0 +- 0.5 m
     164//
     165//
     166//                 D1*D1
     167// conversion C = ------ = 0.0069
     168//                 D2*D2
     169//
     170// Delta C / C  = 2 * Sqrt( (Delta D1/D1)2 + (Delta D2/D2)2 )
     171// Delta C / C  = 0.4
     172//
     173// C = 0.007 +- 0.003
     174//
     175const Float_t MCalibrationCam::gkCalibrationFluxCameravsPINDiode      = 0.007;
     176const Float_t MCalibrationCam::gkCalibrationFluxCameravsPINDiodeErr   = 0.003;
     177
     178//
     179// Average QE of the PIN Diode
     180//
     181const Float_t MCalibrationCam::gkCalibrationPINDiodeQEGreen = -1.0;
     182const Float_t MCalibrationCam::gkCalibrationPINDiodeQEBlue  = -1.0;
     183const Float_t MCalibrationCam::gkCalibrationPINDiodeQEUV    = -1.0;
     184const Float_t MCalibrationCam::gkCalibrationPINDiodeQECT1   = -1.0;
     185
     186//
     187// Average QE of the PIN Diode
     188//
     189const Float_t MCalibrationCam::gkCalibrationPINDiodeQEGreenErr = -1.0;
     190const Float_t MCalibrationCam::gkCalibrationPINDiodeQEBlueErr  = -1.0;
     191const Float_t MCalibrationCam::gkCalibrationPINDiodeQEUVErr    = -1.0;
     192const Float_t MCalibrationCam::gkCalibrationPINDiodeQECT1Err   = -1.0;
    160193
    161194// --------------------------------------------------------------------------

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

    r3243 r3244  
    4141  static const Float_t gkCalibrationBlindPixelAttCT1  ;
    4242
     43  static const Float_t gkCalibrationFluxCameravsPINDiode     ;
     44  static const Float_t gkCalibrationFluxCameravsPINDiodeErr  ;
     45 
     46  static const Float_t gkCalibrationPINDiodeQEGreen;
     47  static const Float_t gkCalibrationPINDiodeQEBlue ;
     48  static const Float_t gkCalibrationPINDiodeQEUV   ;
     49  static const Float_t gkCalibrationPINDiodeQECT1  ;
     50 
     51  static const Float_t gkCalibrationPINDiodeQEGreenErr;
     52  static const Float_t gkCalibrationPINDiodeQEBlueErr ;
     53  static const Float_t gkCalibrationPINDiodeQEUVErr   ;
     54  static const Float_t gkCalibrationPINDiodeQECT1Err  ;
     55 
    4356  Int_t fNumPixels;
    4457  TClonesArray *fPixels;                      //-> Array of MCalibrationPix with fit results

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

    r3242 r3244  
    8686/////////////////////////////////////////////////////////////////////////////
    8787#include "MCalibrationPix.h"
    88 #include "MCalibrationConfig.h"
    8988
    9089#include "MLog.h"
Note: See TracChangeset for help on using the changeset viewer.