Changeset 8618 for trunk/MagicSoft/Mars/mpointing

Timestamp:

06/28/07 21:30:25 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpointing

Files:

• MSrcPosCalc.cc (modified) (4 diffs)
• MSrcPosCalc.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc

@@ -68 +68 @@
 
 #include "MParList.h"
+#include "MTaskList.h"
 
 #include "MLog.h"
@@ -94 +95 @@
 MSrcPosCalc::MSrcPosCalc(const char *name, const char *title)
     : fObservatory(NULL), fPointPos(NULL), fSourcePos(NULL), fDeviation(NULL),
-    fSrcPosCam(NULL), fSrcPosAnti(NULL), fGeom(NULL), fTime(NULL), fMode(kDefault)
+    fSrcPosCam(NULL), fSrcPosAnti(NULL), fGeom(NULL), fTime(NULL), fCallback(NULL),
+    fMode(kDefault)
 {
     fName  = name  ? name  : "MSrcPosCalc";
@@ -196 +198 @@
     //*fLog << "Pointing Position: " << GetRaDec(*fPointPos)  << endl;
     *fLog << "Source Position: " << GetRaDec(*fSourcePos) << endl;
+    if (fCallback)
+        *fLog << "Using " << fCallback->GetNumPasses() << " off-regions." << endl;
 
     // For the case ReInit is never called we try:
@@ -215 +219 @@
     {
         fSrcPosAnti->SetXY(v);
-        v *= -1;
+
+        if (fCallback)
+        {
+            const Double_t step = TMath::TwoPi()/(fCallback->GetNumPasses()+1);
+            v = v.Rotate(step*(fCallback->GetNumPass()+1));
+        }
+        else
+            v *= -1;
+
         fSrcPosCam->SetXY(v);
     }

trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.h

@@ -17 +17 @@
 class MTime;
 class MVector3;
+class MTaskList;
 
 class MSrcPosCalc : public MTask
@@ -39 +40 @@
     MGeomCam     *fGeom;
     MTime        *fTime;
+    MTaskList    *fCallback;
 
     UShort_t fRunType;            //! Run Type to decide where to get pointing position from
@@ -68 +70 @@
     void SetOwner(Bool_t b=kTRUE) { b ? SetBit(kIsOwner) : ResetBit(kIsOwner); } // Make MSrcPosCalc owner of fSourcePos
     void SetMode(Mode_t m=kDefault) { fMode = m; }
+    void SetCallback(MTaskList *list) { fCallback=list; }
 
     ClassDef(MSrcPosCalc, 0) // Calculates the source position in the camera