Changeset 4807 for trunk

Timestamp:

08/30/04 16:22:48 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCalc.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
 
    * mcalib/MCalibrationChargeCalc.cc
+   * mcalib/MHCalibrationTestTimeCam.cc
      - exchanged all arrays by TArray's
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -996 +996 @@
   const UInt_t nsectors = fGeom->GetNumSectors();
 
-  Float_t lowlim      [nareas];
-  Float_t upplim      [nareas];
-  Double_t areavars   [nareas];
-  Double_t areaweights[nareas], sectorweights [nsectors];
-  Double_t areaphes   [nareas], sectorphes    [nsectors];
-  Int_t   numareavalid[nareas], numsectorvalid[nsectors];
-
-  memset(lowlim        ,0, nareas   * sizeof(Float_t));
-  memset(upplim        ,0, nareas   * sizeof(Float_t));
-  memset(areaphes      ,0, nareas   * sizeof(Double_t));
-  memset(areavars      ,0, nareas   * sizeof(Double_t));
-  memset(areaweights   ,0, nareas   * sizeof(Double_t));
-  memset(numareavalid  ,0, nareas   * sizeof(Int_t  ));
-  memset(sectorweights ,0, nsectors * sizeof(Double_t));
-  memset(sectorphes    ,0, nsectors * sizeof(Double_t));
-  memset(numsectorvalid,0, nsectors * sizeof(Int_t  ));
-  
+  TArrayF lowlim        (nareas);
+  TArrayF upplim        (nareas);
+  TArrayD areavars      (nareas);
+  TArrayD areaweights   (nareas);
+  TArrayD sectorweights (nsectors);
+  TArrayD areaphes      (nareas);
+  TArrayD sectorphes    (nsectors);
+  TArrayI numareavalid  (nareas);
+  TArrayI numsectorvalid(nsectors);
+
   //
   // First loop: Get mean number of photo-electrons and the RMS
@@ -1127 +1120 @@
   *fLog << endl;
 
-  memset(numareavalid,0,nareas*sizeof(Int_t));
-  memset(areaphes    ,0,nareas*sizeof(Double_t));
-  memset(areavars    ,0,nareas*sizeof(Double_t));
-
+  numareavalid.Reset();
+  areaphes    .Reset();
+  areavars    .Reset();
   //
   // Second loop: Get mean number of photo-electrons and its RMS excluding 
@@ -1564 +1556 @@
     fCam->SetNumPhotonsFFactorMethodErr(TMath::Sqrt( avphotrelvar * avphotons * avphotons));  
 
-  Float_t lowlim           [nareas];
-  Float_t upplim           [nareas];
-  Double_t avffactorphotons [nareas];
-  Double_t avffactorphotvar [nareas];
-  Int_t   numffactor       [nareas];
-
-  memset(lowlim          ,0, nareas   * sizeof(Float_t));
-  memset(upplim          ,0, nareas   * sizeof(Float_t));
-  memset(avffactorphotons,0, nareas   * sizeof(Double_t));
-  memset(avffactorphotvar,0, nareas   * sizeof(Double_t));
-  memset(numffactor      ,0, nareas   * sizeof(Int_t));
+  TArrayF lowlim           (nareas);
+  TArrayF upplim           (nareas);
+  TArrayD avffactorphotons (nareas);
+  TArrayD avffactorphotvar (nareas);
+  TArrayI numffactor       (nareas);
 
   const UInt_t npixels  = fGeom->GetNumPixels();
@@ -1911 +1897 @@
   const Int_t nareas = fGeom->GetNumAreas();
 
-  Int_t counts[nareas];
-  memset(counts,0,nareas*sizeof(Int_t));
+  TArrayI counts(nareas);
 
   for (Int_t i=0; i<fBadPixels->GetSize(); i++)
@@ -1928 +1913 @@
           << Form("%s%3i%s%3i","Inner: ",counts[0]," Outer: ",counts[1]) << endl;
   
-  memset(counts,0,nareas*sizeof(Int_t));
+  counts.Reset();
 
   for (Int_t i=0; i<fBadPixels->GetSize(); i++)
@@ -1947 +1932 @@
           << Form("%s%3i%s%3i","Inner: ",counts[0]," Outer: ",counts[1]) << endl;
 
-  memset(counts,0,nareas*sizeof(Int_t));
+  counts.Reset();
 
   for (Int_t i=0; i<fBadPixels->GetSize(); i++)