Changeset 2674

Timestamp:

12/15/03 15:41:15 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MGeomApply.cc (modified) (1 diff)
• mgeom/MGeomCam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/12/15: Abelardo Moralejo
+
+   * mgeom/MGeomCam.h
+     - made the CalcPixRatio function public.
+
+   * manalysis/MGeomApply.cc
+     - call the CalcPixRatio of the MGeomCam object. Workaround to 
+       allow the analysis of some files from a beta version of camera 
+       0.7 in which the array containing pixel ratios was not 
+       initialized.
 
  2003/12/12: Markus Gaug / Michele Doro

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -106 +106 @@
     }
 
+    // FIXME, workaround: this call to CalcPixRatio is here just to allow
+    // the use of some camera files from the 0.7 beta version in which the 
+    // array containing pixel ratios is not initialized.
+
+    cam->CalcPixRatio();
+
     MPedestalCam *ped = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     if (ped)

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -31 +31 @@
 
 protected:
-    void CalcPixRatio();
     void CalcMaxRadius();
     void CalcNumSectors();
@@ -49 +48 @@
 
     virtual TObject *Clone(const char *newname=NULL) const;
+
+    void CalcPixRatio(); 
+    // FIXME, workaround: this function is made public just to allow
+    // the use of some camera files from the 0.7 beta version in which the 
+    // array containing pixel ratios is not initialized.
 
     Float_t GetCameraDist() const { return fCamDist; }