Changeset 9338 for trunk/MagicSoft/Mars/mpointing

Timestamp:

02/15/09 15:09:12 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpointing

Files:

• MHSrcPosCam.cc (modified) (5 diffs)
• MHSrcPosCam.h (modified) (2 diffs)
• MSrcPosRndm.cc (modified) (3 diffs)
• MSrcPosRndm.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mpointing/MHSrcPosCam.cc

@@ -58 +58 @@
 //
 MHSrcPosCam::MHSrcPosCam(Bool_t wobble, const char *name, const char *title)
-    : fTimeEffOn(NULL), fEffOnTime(NULL), fSourcePos(NULL),
+    : fTimeEffOn(NULL), fEffOnTime(NULL), fSourcePos(NULL), fGeom(NULL),
     fPositions("TVector2", 50000)
 {
@@ -89 +89 @@
 Bool_t MHSrcPosCam::SetupFill(const MParList *pl)
 {
-    MGeomCam *geom = (MGeomCam*)pl->FindObject("MGeomCam");
-    if (!geom)
+    fGeom = (MGeomCam*)pl->FindObject("MGeomCam");
+    if (!fGeom)
     {
         *fLog << err << "ERROR - MGeomCam not found... aborting." << endl;
@@ -121 +121 @@
 
     fHist.Reset();
-    fConvMm2Deg = geom->GetConvMm2Deg();
-    fNum        = 0;
+    fNum = 0;
 
     return kTRUE;
@@ -146 +145 @@
     if (!fEffOnTime)
     {
-        const TVector2 v(cam->GetXY()*fConvMm2Deg);
+        const TVector2 v(cam->GetXY()*fGeom->GetConvMm2Deg());
         fHist.Fill(v.X(), v.Y(), w);
         return kTRUE;
@@ -157 +156 @@
     // buffer position into array (could be speed up a little bit more
     // by using ExpandCreate and memcpy)
-    new (fPositions[fNum++]) TVector2(cam->GetXY()*fConvMm2Deg);
+    new (fPositions[fNum++]) TVector2(cam->GetXY()*fGeom->GetConvMm2Deg());
 
     // Check if there is a new effective on time

trunk/MagicSoft/Mars/mpointing/MHSrcPosCam.h

@@ -18 +18 @@
 #endif
 
+class MGeomCam;
 class MParList;
 class MParameterD;
@@ -31 +32 @@
     MParameterD  *fEffOnTime;      //! Effective on time
     MPointingPos *fSourcePos;      //! Pointing position of the telescope
+    MGeomCam     *fGeom;           //! Conversion from mm to deg
 
-    Double_t      fConvMm2Deg;     //! Conversion factor from mm to deg
     TClonesArray  fPositions;      //! Buffer to store source positions
     Int_t         fNum;            //! Position in array

trunk/MagicSoft/Mars/mpointing/MSrcPosRndm.cc

@@ -57 +57 @@
 Int_t MSrcPosRndm::PreProcess(MParList *plist)
 {
-    MGeomCam *geom = (MGeomCam*)plist->FindObject("MGeomCam");
-    if (!geom)
+    fGeom = (MGeomCam*)plist->FindObject("MGeomCam");
+    if (!fGeom)
     {
         *fLog << err << "ERROR - MGeomCam not found... aborting." << endl;
@@ -86 +86 @@
         *fLog << inf << "Source position will be produced randomly in a distance of " << fDistOfSource << "° from the camera center!" << endl;
 
-    fConvMm2Deg = geom->GetConvMm2Deg();
-
     return kTRUE;
 }
@@ -107 +105 @@
     }
 
-    fSrcPos->SetXY(x/fConvMm2Deg, y/fConvMm2Deg);
+    const Double_t f = fGeom->GetConvMm2Deg();
+
+    fSrcPos->SetXY(x/f, y/f);
     if (fDistOfSource>=0)
-        fSrcPosAnti->SetXY(-x/fConvMm2Deg, -y/fConvMm2Deg);
+        fSrcPosAnti->SetXY(-x/f, -y/f);
     return kTRUE;
 }

trunk/MagicSoft/Mars/mpointing/MSrcPosRndm.h

@@ -6 +6 @@
 #endif
 
+class MGeomCam;
 class MSrcPosCam;
 class MHSrcPosCam;
@@ -15 +16 @@
     MSrcPosCam   *fSrcPosAnti; //!
     MHSrcPosCam  *fHist;       //!
-
-    Double_t fConvMm2Deg;
+    MGeomCam     *fGeom;       //! Conversion factor from mm to deg
 
     Double_t fDistOfSource; // [deg] Distance of the source from the camera center
@@ -24 +24 @@
 
 public:
-    MSrcPosRndm() : fSrcPos(0), fHist(0), fDistOfSource(-1)
+    MSrcPosRndm() : fSrcPos(0), fSrcPosAnti(0), fHist(0), fGeom(0), fDistOfSource(-1)
     {
         fName  = "MSrcPosRndm";