Changeset 4074 for trunk/MagicSoft/Mars/mtemp/mifae/programs

Timestamp:

05/14/04 17:24:17 (21 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae/programs

Files:

• srcPos.cc (modified) (5 diffs)
• srcpos.datacard (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/mifae/programs/srcPos.cc

@@ -20 +20 @@
 #include "MHillasSrc.h"
 #include "MSrcRotate.h"
+#include "MSrcPosFromFile.h"
 #include "MSrcTranslate.h"
 #include "MParList.h"
@@ -47 +48 @@
 Float_t  xsrcpos=0.;
 Float_t  ysrcpos=0.;
-Double_t mjdpos=53050;
+Double_t mjdpos=0;
 Bool_t   kRotate=0;
 Bool_t   kSrcPolicy=kFALSE;
@@ -113 +114 @@
   read.DisableAutoScheme();  
 
-  MSrcTranslate srctranslate;
-  srctranslate.SetTranslation(xpos,ypos);
-  srctranslate.SetRelativeTranslation(kSrcPolicy);
-
-  MSrcRotate    srcrotate;
-  srcrotate.SetRAandDECandRefMJD(fRA,fDEC,mjdpos); 
+  MSrcTranslate   srctranslate;
+  MSrcRotate      srcrotate;
+  MSrcPosFromFile srcfromfile;
+
+  if(srcFile.Length())
+    {
+      srcfromfile.SetInputFileName(srcFile);
+      srcfromfile.SetMode(MSrcPlace::kOn);
+    }
+  else
+    {
+      srctranslate.SetTranslation(xpos,ypos);
+      srctranslate.SetRelativeTranslation(kSrcPolicy);
+      srcrotate.SetRAandDECandRefMJD(fRA,fDEC,mjdpos); 
+      srcrotate.SetMode(MSrcPlace::kOn);
+    }
 
   MHillasSrcCalc csrc1;   
@@ -134 +145 @@
   // include tasks in task list
   tlist.AddToList(&read);
-  tlist.AddToList(&srctranslate);
-  if(kRotate) 
-    tlist.AddToList(&srcrotate);  
+  if(srcFile.Length())
+    tlist.AddToList(&srcfromfile);
+  else
+    {
+      tlist.AddToList(&srctranslate);
+      if(kRotate) 
+        tlist.AddToList(&srcrotate);  
+    }
   tlist.AddToList(&csrc1);  
   tlist.AddToList(&write);
@@ -170 +186 @@
   tlist.RemoveFromList(&write);
 
-  srcrotate.SetMode(MSrcPlace::kOff);
+  if(srcFile.Length())
+    srcfromfile.SetMode(MSrcPlace::kOff);
+  else
+    srcrotate.SetMode(MSrcPlace::kOff);
 
   if (!evtloop.Eventloop(nmaxevents))

trunk/MagicSoft/Mars/mtemp/mifae/programs/srcpos.datacard

@@ -31 +31 @@
 
 
-// File containing source position as a function of run number (overrides SRCPOS, SRCABS, ROTFLAG and SRCCOORDS values)
-// SRCFILE ./20040215_Mrk421.B.pos
+// File containing source position as a function of run number (invalidates SRCPOS, SRCABS, ROTFLAG and SRCCOORDS values)
+SRCFILE ./20040215_Mrk421.B.pos