Changeset 5557 for trunk/MagicSoft/Mars/mcalib

Timestamp:

12/03/04 20:11:31 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (2 diffs)
• MCalibrationChargeCam.cc (modified) (12 diffs)
• MCalibrationChargeCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -760 +760 @@
   }
 
+  *fLog << all << "--1--" << fGeom << " " << fPedestals << endl;
+
   for (UInt_t aidx=0; aidx<fGeom->GetNumAreas(); aidx++)
     {
@@ -766 +768 @@
       MCalibrationChargePix &pix = (MCalibrationChargePix&)chargecam->GetAverageArea(aidx);
 
+      *fLog << "1: " << aidx << " " << &ped << " " << &pix << endl;
       FinalizePedestals(ped,pix,aidx);
+      *fLog << "2: " << aidx << endl;
       FinalizeCharges(pix, 
                       fIntensCam ? fIntensCam->GetAverageBadArea(aidx) : fCam->GetAverageBadArea(aidx),
-                      "area id");
-    }
+                      "area idx");
+      *fLog << "3: " << aidx << endl;
+    }
+  *fLog << all << "--2--" << fGeom << " " << fPedestals << endl;
   
   *fLog << endl;

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -631 +631 @@
 // arr[1]: Error (rms) of averaged conversion factors (default: 0.)
 //
-// ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
-//
-TArrayF *MCalibrationChargeCam::GetAveragedConvFADC2PhotPerArea  ( const MGeomCam &geom, const MCalibrationQECam &qecam,
+TArrayF MCalibrationChargeCam::GetAveragedConvFADC2PhotPerArea  ( const MGeomCam &geom, const MCalibrationQECam &qecam,
                                            const UInt_t ai,  MBadPixelsCam *bad)
 {
@@ -667 +665 @@
     }
 
-  TArrayF *arr = new TArrayF(2);
-  arr->AddAt(nr   ? mean/nr : -1.,0);
-  arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
+  TArrayF arr(2);
+  arr[0] = nr   ? mean/nr : -1;
+  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
 
   return arr;
@@ -687 +685 @@
 // arr[1]: Error (rms) of averaged conversion factors (default: 0.)
 //
-// ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
-//
-TArrayF *MCalibrationChargeCam::GetAveragedConvFADC2PhotPerSector( const MGeomCam &geom, const MCalibrationQECam &qecam,
+TArrayF MCalibrationChargeCam::GetAveragedConvFADC2PhotPerSector( const MGeomCam &geom, const MCalibrationQECam &qecam,
                                              const UInt_t sec, MBadPixelsCam *bad)
 {
@@ -722 +718 @@
     }
 
-  TArrayF *arr = new TArrayF(2);
-  arr->AddAt(nr   ? mean/nr : -1.,0);
-  arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
-
+  TArrayF arr(2);
+  arr[0] = nr   ? mean/nr : -1;
+  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
   return arr;
 }  
@@ -741 +736 @@
 // arr[1]: Error (rms) of averaged mean arrival times (default: 0.)
 //
-// ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
-//
-TArrayF *MCalibrationChargeCam::GetAveragedArrivalTimeMeanPerArea  ( const MGeomCam &geom, 
-                                           const UInt_t ai,  MBadPixelsCam *bad)
+TArrayF MCalibrationChargeCam::GetAveragedArrivalTimeMeanPerArea(const MGeomCam &geom,
+                                                                 const UInt_t ai,  MBadPixelsCam *bad)
 {
 
@@ -772 +765 @@
     }
 
-  TArrayF *arr = new TArrayF(2);
-  arr->AddAt(nr   ? mean/nr : -1.,0);
-  arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
-
+  TArrayF arr(2);
+  arr[0] = nr   ? mean/nr : -1;
+  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
   return arr;
 }
@@ -791 +783 @@
 // arr[1]: Error (rms) of averaged mean arrival times (default: 0.)
 //
-// ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
-//
-TArrayF *MCalibrationChargeCam::GetAveragedArrivalTimeMeanPerSector( const MGeomCam &geom, 
-                                             const UInt_t sec, MBadPixelsCam *bad)
+TArrayF MCalibrationChargeCam::GetAveragedArrivalTimeMeanPerSector(const MGeomCam &geom,
+                                                                   const UInt_t sec, MBadPixelsCam *bad)
 {
   const Int_t np = GetSize();
@@ -821 +811 @@
     }
 
-  TArrayF *arr = new TArrayF(2);
-  arr->AddAt(nr   ? mean/nr : -1.,0);
-  arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
-
+  TArrayF arr(2);
+  arr[0] = nr   ? mean/nr : -1;
+  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
   return arr;
 }  
@@ -840 +829 @@
 // arr[1]: Error (rms) of averaged arrival time RMSs (default: 0.)
 //
-// ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
-//
-TArrayF *MCalibrationChargeCam::GetAveragedArrivalTimeRmsPerArea  ( const MGeomCam &geom, 
-                                           const UInt_t ai,  MBadPixelsCam *bad)
+TArrayF MCalibrationChargeCam::GetAveragedArrivalTimeRmsPerArea  ( const MGeomCam &geom,
+                                                                   const UInt_t ai,  MBadPixelsCam *bad)
 {
 
@@ -871 +858 @@
     }
 
-  TArrayF *arr = new TArrayF(2);
-  arr->AddAt(nr   ? mean/nr : -1.,0);
-  arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
-
+  TArrayF arr(2);
+  arr[0] = nr   ? mean/nr : -1;
+  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
   return arr;
 }
@@ -890 +876 @@
 // arr[1]: Error (rms) of averaged arrival time RMSs (default: 0.)
 //
-// ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
-//
-TArrayF *MCalibrationChargeCam::GetAveragedArrivalTimeRmsPerSector( const MGeomCam &geom, const UInt_t sec, MBadPixelsCam *bad)
+TArrayF MCalibrationChargeCam::GetAveragedArrivalTimeRmsPerSector( const MGeomCam &geom, const UInt_t sec, MBadPixelsCam *bad)
 {
   const Int_t np = GetSize();
@@ -918 +902 @@
     }
 
-  TArrayF *arr = new TArrayF(2);
-  arr->AddAt(nr   ? mean/nr : -1.,0);
-  arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
+  TArrayF arr(2);
+  arr[0] = nr   ? mean/nr : -1;
+  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
 
   return arr;

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h

@@ -44 +44 @@
   Bool_t  IsFFactorMethodValid            () const;
 
-  TArrayF *GetAveragedConvFADC2PhotPerArea    ( const MGeomCam &geom, const MCalibrationQECam &qecam,
-                                                const UInt_t ai=0,  MBadPixelsCam *bad=NULL);
-  TArrayF *GetAveragedConvFADC2PhotPerSector  ( const MGeomCam &geom, const MCalibrationQECam &qecam,
-                                                const UInt_t sec=0, MBadPixelsCam *bad=NULL);  
-  TArrayF *GetAveragedArrivalTimeMeanPerArea  ( const MGeomCam &geom, 
-                                                const UInt_t ai=0,  MBadPixelsCam *bad=NULL);
-  TArrayF *GetAveragedArrivalTimeMeanPerSector( const MGeomCam &geom, 
-                                                const UInt_t sec=0, MBadPixelsCam *bad=NULL);  
-  TArrayF *GetAveragedArrivalTimeRmsPerArea   ( const MGeomCam &geom, 
-                                                const UInt_t ai=0,  MBadPixelsCam *bad=NULL);
-  TArrayF *GetAveragedArrivalTimeRmsPerSector ( const MGeomCam &geom, 
-                                                const UInt_t sec=0, MBadPixelsCam *bad=NULL);  
+  TArrayF GetAveragedConvFADC2PhotPerArea    (const MGeomCam &geom, const MCalibrationQECam &qecam,
+                                              const UInt_t ai=0,  MBadPixelsCam *bad=NULL);
+  TArrayF GetAveragedConvFADC2PhotPerSector  (const MGeomCam &geom, const MCalibrationQECam &qecam,
+                                              const UInt_t sec=0, MBadPixelsCam *bad=NULL);
+  TArrayF GetAveragedArrivalTimeMeanPerArea  (const MGeomCam &geom,
+                                              const UInt_t ai=0,  MBadPixelsCam *bad=NULL);
+  TArrayF GetAveragedArrivalTimeMeanPerSector(const MGeomCam &geom,
+                                              const UInt_t sec=0, MBadPixelsCam *bad=NULL);
+  TArrayF GetAveragedArrivalTimeRmsPerArea   (const MGeomCam &geom,
+                                              const UInt_t ai=0,  MBadPixelsCam *bad=NULL);
+  TArrayF GetAveragedArrivalTimeRmsPerSector (const MGeomCam &geom,
+                                              const UInt_t sec=0, MBadPixelsCam *bad=NULL);
   
   // Prints