Changeset 5346 for trunk/MagicSoft/Mars

Timestamp:

11/05/04 10:51:28 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/calibration.C (modified) (1 diff)
• mcalib/MCalibrationTestCalc.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/macros/calibration.C

@@ -172 +172 @@
   //
   //  MExtractTimeHighestIntegral timeext;
-  //  MExtractTimeFastSpline timeext;
+  MExtractTimeFastSpline timeext;
   //  MExtractTimeSpline timeext;
   //

trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc

@@ -62 +62 @@
 
 #include "MHCalibrationTestCam.h"
-#include "MHCalibrationTestPix.h"
+#include "MHCalibrationPix.h"
 
 #include "MCalibrationIntensityTestCam.h"
@@ -265 +265 @@
     {
       
-      MHCalibrationTestPix &hist = (MHCalibrationTestPix&)(*fTestCam)[i];
-      MCalibrationTestPix  &pix =  (MCalibrationTestPix &) (*testcam)[i];
+      MHCalibrationPix     &hist = (*fTestCam)[i];
+      MCalibrationTestPix  &pix =  (MCalibrationTestPix&)(*testcam)[i];
       //
       // We assume that the pixels have been interpolated so far. 
@@ -276 +276 @@
           continue;
         }
-      
 
       const Double_t nphot    = hist.GetMean();
@@ -394 +393 @@
     {
       
-      MHCalibrationTestPix &hist = (MHCalibrationTestPix&)(*fTestCam)[i];
+      MHCalibrationPix &hist    = (*fTestCam)[i];
       MCalibrationTestPix  &pix =  (MCalibrationTestPix&) (*testcam)[i];