Changeset 3244 for trunk/MagicSoft

Timestamp:

02/19/04 21:59:01 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrateData.cc (modified) (1 diff)
• mcalib/MCalibrationCalc.cc (modified) (1 diff)
• mcalib/MCalibrationCam.cc (modified) (2 diffs)
• mcalib/MCalibrationCam.h (modified) (1 diff)
• mcalib/MCalibrationConfig.h (deleted)
• mcalib/MCalibrationPix.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -17 +17 @@
      - took out some configuration numbers and put them directly into 
        the class
+     - remove completely MCalibrationConfig.h
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -48 +48 @@
 //////////////////////////////////////////////////////////////////////////////
 #include "MCalibrateData.h"
-#include "MCalibrationConfig.h"
 
 #include "MLog.h"

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -79 +79 @@
 // FXIME: Usage of fstream is a preliminary workaround!
 #include <fstream>
-
-// FXIME: This has to be removed!!!! (YES, WHEN WE HAVE ACCESS TO THE DATABASE!!!!!)
-#include "MCalibrationConfig.h"
 
 #include <TSystem.h>

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -127 +127 @@
 
 #include "MCalibrationPix.h"
-#include "MCalibrationConfig.h"
 #include "MCalibrationBlindPix.h"
 #include "MCalibrationPINDiode.h"
@@ -157 +156 @@
 const Float_t MCalibrationCam::gkCalibrationBlindPixelAttCT1   = 1.95;
 
-
+// ----- PIN DIODE ------------------------//
+//
+// Area of Inner Pixel w.r.t. PIN Diode (which is 1 cm2)
+//
+// Distance of PIN Diode to pulser D1:   1.5  +- 0.3 m
+// Distance of Inner Pixel to pulser D2: 18.0 +- 0.5 m
+//
+//
+//                 D1*D1
+// conversion C = ------ = 0.0069
+//                 D2*D2
+//
+// Delta C / C  = 2 * Sqrt( (Delta D1/D1)2 + (Delta D2/D2)2 )
+// Delta C / C  = 0.4
+// 
+// C = 0.007 +- 0.003
+//
+const Float_t MCalibrationCam::gkCalibrationFluxCameravsPINDiode      = 0.007;
+const Float_t MCalibrationCam::gkCalibrationFluxCameravsPINDiodeErr   = 0.003;
+
+//
+// Average QE of the PIN Diode
+//
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEGreen = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEBlue  = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEUV    = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQECT1   = -1.0;
+
+//
+// Average QE of the PIN Diode
+//
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEGreenErr = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEBlueErr  = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEUVErr    = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQECT1Err   = -1.0;
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -41 +41 @@
   static const Float_t gkCalibrationBlindPixelAttCT1  ;
 
+  static const Float_t gkCalibrationFluxCameravsPINDiode     ;
+  static const Float_t gkCalibrationFluxCameravsPINDiodeErr  ;
+  
+  static const Float_t gkCalibrationPINDiodeQEGreen;
+  static const Float_t gkCalibrationPINDiodeQEBlue ;
+  static const Float_t gkCalibrationPINDiodeQEUV   ;
+  static const Float_t gkCalibrationPINDiodeQECT1  ;
+  
+  static const Float_t gkCalibrationPINDiodeQEGreenErr;
+  static const Float_t gkCalibrationPINDiodeQEBlueErr ;
+  static const Float_t gkCalibrationPINDiodeQEUVErr   ;
+  static const Float_t gkCalibrationPINDiodeQECT1Err  ;
+ 
   Int_t fNumPixels;
   TClonesArray *fPixels;                      //-> Array of MCalibrationPix with fit results

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc

@@ -86 +86 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MCalibrationPix.h"
-#include "MCalibrationConfig.h"
 
 #include "MLog.h"