Changeset 3669

Timestamp:

04/06/04 16:23:10 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationChargeCam.cc (modified) (4 diffs)
• mcalib/MHCalibrationRelTimeCam.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -133 +133 @@
      - updated and enlarged documentation
 
+   * mcalib/MHCalibrationChargeCam.cc
+   * mcalib/MHCalibrationRelTimeCam.cc
+     - set the arrays by use of memset
+     - initialize TObjArrays with the Init-Function
 
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -216 +216 @@
 {
 
-  const Int_t npixels  = fGeom->GetNumPixels();
-  const Int_t nsectors = fGeom->GetNumSectors();
-  const Int_t nareas   = fGeom->GetNumAreas();
-
   fCam = (MCalibrationCam*)pList->FindObject("MCalibrationChargeCam");
   if (!fCam)
@@ -230 +226 @@
         }
       else 
-        {
-          fCam->InitSize(npixels);
-          fCam->InitAverageAreas(nareas);
-          fCam->InitAverageSectors(nsectors);
-        }
+        fCam->Init(*fGeom);
     }
 
@@ -243 +235 @@
       return kFALSE;
   }
+
+  const Int_t npixels  = fGeom->GetNumPixels();
+  const Int_t nsectors = fGeom->GetNumSectors();
+  const Int_t nareas   = fGeom->GetNumAreas();
 
   if (fHiGainArray->GetEntries()==0)
@@ -397 +393 @@
   Int_t   sathisector[nsectors], satlosector[nsectors];
 
-  for (UInt_t j=0; j<nareas; j++)
-    {
-      sumhiarea  [j] = sumloarea  [j] = timehiarea  [j] =  timeloarea  [j] = 0.;
-      sathiarea  [j] = satloarea  [j] = 0;
-    }
-  
-  for (UInt_t j=0; j<nsectors; j++)
-    {
-      sumhisector[j] = sumlosector[j] = timehisector[j] =  timelosector[j] = 0.;
-      sathisector[j] = satlosector[j] = 0;
-    }
-  
+  memset(sumhiarea,   0, nareas * sizeof(Float_t));
+  memset(sumloarea,   0, nareas * sizeof(Float_t));
+  memset(timehiarea,  0, nareas * sizeof(Float_t));
+  memset(timeloarea,  0, nareas * sizeof(Float_t));
+  memset(sathiarea,   0, nareas * sizeof(Int_t  ));
+  memset(satloarea,   0, nareas * sizeof(Int_t  ));
+  memset(sumhisector, 0, nsectors*sizeof(Float_t));
+  memset(sumlosector, 0, nsectors*sizeof(Float_t));
+  memset(timehisector,0, nsectors*sizeof(Float_t));
+  memset(timelosector,0, nsectors*sizeof(Float_t));
+  memset(sathisector, 0, nsectors*sizeof(Int_t  ));
+  memset(satlosector, 0, nsectors*sizeof(Int_t  ));
 
   for (UInt_t i=0; i<npixels; i++)

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc

@@ -153 +153 @@
 {
 
-  const Int_t npixels  = fGeom->GetNumPixels();
-  const Int_t nsectors = fGeom->GetNumSectors();
-  const Int_t nareas   = fGeom->GetNumAreas();
-
   fCam = (MCalibrationCam*)pList->FindObject("MCalibrationRelTimeCam");
   if (!fCam)
@@ -167 +163 @@
         }
       else 
-        {
-          fCam->InitSize(npixels);
-          fCam->InitAverageAreas(nareas);
-          fCam->InitAverageSectors(nsectors);
-        }
+        fCam->Init(*fGeom);
     }
   
@@ -180 +172 @@
       return kFALSE;
   }
+
+  const Int_t npixels  = fGeom->GetNumPixels();
+  const Int_t nsectors = fGeom->GetNumSectors();
+  const Int_t nareas   = fGeom->GetNumAreas();
 
   if (fHiGainArray->GetEntries()==0)
@@ -306 +302 @@
   Int_t   numsectorhi[nsectors], numsectorlo[nsectors];
 
-  for (UInt_t j=0; j<nareas; j++)
-    {
-      sumareahi[j] = sumarealo[j] = 0.;
-      numareahi[j] = numarealo[j] = 0;
-    }
-  
-  for (UInt_t j=0; j<nsectors; j++)
-    {
-      sumsectorhi[j] = sumsectorlo[j] = 0.;
-      numsectorhi[j] = numsectorlo[j] = 0;
-    }
+  memset(sumareahi,   0, nareas * sizeof(Float_t));
+  memset(sumarealo,   0, nareas * sizeof(Float_t));
+  memset(sumsectorhi, 0, nsectors*sizeof(Float_t));
+  memset(sumsectorlo, 0, nsectors*sizeof(Float_t));
   
   const MArrivalTimePix &refpix = (*arrtime)[1];