Changeset 4315 for trunk

Timestamp:

06/21/04 20:03:41 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MHCalibrationCam.h (modified) (1 diff)
• MHCalibrationChargeCam.cc (modified) (4 diffs)
• MHCalibrationChargeCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h

@@ -117 +117 @@
 
   // Clone
-  TObject *Clone(const char *) const;
+  virtual TObject *Clone(const char *) const;
 
   // Draw

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -314 +314 @@
         hist.GetHGausHist()->SetTitle("Summed FADC slices average HiGain Area Idx ");
         hist.SetNbins(fAverageNbins);
+        hist.SetLast(2.*hist.GetLast());
         hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average HiGain Area Idx ");
 
@@ -357 +358 @@
           hist.GetHGausHist()->SetTitle("Summed FADC slices average HiGain Sector ");
           hist.SetNbins(fAverageNbins);
+          hist.SetLast (2.*hist.GetLast());
           hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average HiGain Sector ");
 
@@ -830 +832 @@
   for (Int_t i=0; i<nareas;i++) 
     {
-
       pad->cd(2*(i+1)-1);
       GetAverageHiGainArea(i).Draw("datacheck");
@@ -837 +838 @@
     }      
 }
+
+
+// --------------------------------------------------------------------------
+//
+// Our own clone function is necessary since root 3.01/06 or Mars 0.4
+// I don't know the reason. 
+//
+// Creates new MHCalibrationCam
+//
+TObject *MHCalibrationChargeCam::Clone(const char *) const
+{
+
+  const Int_t navhi = fAverageHiGainAreas->GetEntries();
+  const Int_t navlo = fAverageLoGainAreas->GetEntries();
+  const Int_t nsehi = fAverageHiGainSectors->GetEntries();
+  const Int_t nselo = fAverageLoGainSectors->GetEntries();
+  
+  //
+  // FIXME, this might be done faster and more elegant, by direct copy.
+  //
+  MHCalibrationChargeCam *cam = new MHCalibrationChargeCam();
+
+  cam->fAverageHiGainAreas->Expand(navhi);
+  cam->fAverageLoGainAreas->Expand(navlo);
+  cam->fAverageHiGainSectors->Expand(nsehi);
+  cam->fAverageLoGainSectors->Expand(nselo);
+
+  cam->fAverageHiGainAreas->Expand(navhi);
+  cam->fAverageLoGainAreas->Expand(navlo);
+  cam->fAverageHiGainSectors->Expand(nsehi);
+  cam->fAverageLoGainSectors->Expand(nselo);
+
+  for (int i=0; i<navhi; i++)
+    {
+      //      delete (*cam->fAverageHiGainAreas)[i];
+      (*cam->fAverageHiGainAreas)[i] = (*fAverageHiGainAreas)[i]->Clone();
+    }
+  for (int i=0; i<navlo; i++)
+    {
+      //      delete (*cam->fAverageLoGainAreas)[i];
+      (*cam->fAverageLoGainAreas)[i] = (*fAverageLoGainAreas)[i]->Clone();
+    }
+  for (int i=0; i<nsehi; i++)
+    {
+      //      delete (*cam->fAverageHiGainSectors)[i];
+      (*cam->fAverageHiGainSectors)[i] = (*fAverageHiGainSectors)[i]->Clone();
+    }
+  for (int i=0; i<nselo; i++)
+    {
+      //      delete (*cam->fAverageLoGainSectors)[i];
+      (*cam->fAverageLoGainSectors)[i] = (*fAverageLoGainSectors)[i]->Clone();
+    }
+
+  cam->fAverageAreaNum         = fAverageAreaNum;
+  cam->fAverageAreaSat         = fAverageAreaSat;
+  cam->fAverageAreaSigma       = fAverageAreaSigma;      
+  cam->fAverageAreaSigmaVar    = fAverageAreaSigmaVar;   
+  cam->fAverageAreaRelSigma    = fAverageAreaRelSigma;
+  cam->fAverageAreaRelSigmaVar = fAverageAreaRelSigmaVar;   
+  cam->fAverageSectorNum       = fAverageSectorNum;      
+  cam->fRunNumbers             = fRunNumbers;
+
+  cam->fPulserFrequency        = fPulserFrequency;
+  cam->fAverageNbins           = fAverageNbins;
+
+  return cam;
+
+}
+

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h

@@ -43 +43 @@
   ~MHCalibrationChargeCam() {}
   
+  TObject *Clone(const char *) const;
+
   void SetTimeLowerLimit    ( const Float_t f=fgTimeLowerLimit         ) { fTimeLowerLimit    = f;   }
   void SetTimeUpperLimit    ( const Float_t f=fgTimeUpperLimit         ) { fTimeUpperLimit    = f;   }