Changeset 3860 for trunk/MagicSoft

Timestamp:

04/28/04 10:10:25 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/calibrate_data.C (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/04/28: Markus Gaug
+ 
+   * macros/calibrate_data.C
+     - fixed a bug in loop 3 taking the default QE Cam instead of the 
+       one filled by MJCalibration 
+
+
  2004/04/27: Raquel de los Reyes
 

trunk/MagicSoft/Mars/macros/calibrate_data.C

@@ -24 +24 @@
 \* ======================================================================== */
 
-const TString defpath = "/mnt/Data/rootdata/CrabNebula/2004_01_27/";
+const TString defpath = "/home/rootdata/Calib/2004_04_16/";
 const TString defrout = "output_test.root";
 
-const Int_t defpedr [] = {12461};
-const Int_t defcalr [] = {12526,12527,12528,12529};
-const Int_t defdatar[] = {12517,12518};
+const Int_t defpedr [] = {22265};
+const Int_t defcalr [] = {22300};
+const Int_t defdatar[] = {22300};
 
 void calibrate_data(const TString inpath=defpath, 
                     const Int_t psize=1, const Int_t pedruns[]=defpedr, 
-                    const Int_t csize=4, const Int_t calruns[]=defcalr, 
-                    const Int_t dsize=2, const Int_t dataruns[]=defdatar, 
+                    const Int_t csize=1, const Int_t calruns[]=defcalr, 
+                    const Int_t dsize=1, const Int_t dataruns[]=defdatar, 
                     const TString resname=defrout)
 
@@ -118 +118 @@
   // ---------------------------------------------------
   //
-  MCalibrationQECam qecam;
   MJCalibration     calloop;
   calloop.SetInput(&cruns);
@@ -129 +128 @@
   // Set the corr. cams:
   //
-  calloop.SetQECam(qecam);
   calloop.SetBadPixels(badcam);
   //
@@ -160 +158 @@
   MCalibrationChargeCam  &calcam  = calloop.GetCalibrationCam();
   MCalibrationRelTimeCam &timecam = calloop.GetRelTimeCam();
+  MCalibrationQECam      &qecam   = calloop.GetQECam();
 
   badbad.Print();