Changeset 4585 for trunk/MagicSoft

Timestamp:

08/12/04 07:15:35 (20 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MSourcePosfromStarPos.cc (modified) (6 diffs)
• manalysis/MSourcePosfromStarPos.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
 
   2004/08/12 : Wolfgang Wittek
+
+    * manalysis/MSourcPosFromStarPos.[h,cc]
+      - replace MMcEvt by MPointingPos
 
     * manalysis/MSigmabarCalc.[h,cc]

trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.cc

@@ -56 +56 @@
 #include "MSrcPosCam.h"
 #include "MPointingPos.h"
+#include "MMcEvt.hxx"
 
 #include "MLog.h"
@@ -97 +98 @@
     fdyStar.ResizeTo(fRows,fSize);
 
-    fStars = 0;
+    fStars     = 0;
+    fStarsRead = 0;
     fDecSource = 0.0;
     fRaSource  = 0.0;
@@ -255 +257 @@
    }
 
-
-    fSrcPos = (MSrcPosCam*)pList->FindObject(AddSerialNumber("MSrcPosCam"));
+   fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt");
+   if (!fMcEvt)
+   {
+       *fLog << all << "MSourcePosfromStarPos::PreProcess; MMcEvt not found... continue." << endl;
+   }
+   else
+   {
+       *fLog << all << "MSourcePosfromStarPos::PreProcess; MMcEvt was found... continue." << endl;
+   }
+
+
+    fSrcPos = (MSrcPosCam*)pList->FindCreateObj("MSrcPosCam");
     if (!fSrcPos)
     {
@@ -490 +502 @@
 Bool_t MSourcePosfromStarPos::ReInit(MParList *pList)
 {
-  //if (1 == 1) return kTRUE;
-
-
   Int_t run = fRun->GetRunNumber();
   *fLog << all << "MSourcePosfromStarPos::ReInit; run = " << run << endl;
 
+  // temporary solution for MC
+  // copy (theta, phi) from MMcEvt into MPointingPos
+  if (fRun->GetRunType() > 255.5)
+  {
+    *fLog << all << "                     these are MC data" << endl;
+    Double_t thetarad = fMcEvt->GetTelescopeTheta();
+    Double_t phirad   = fMcEvt->GetTelescopePhi();
+    fPointPos->SetLocalPosition(thetarad*kRad2Deg, phirad*kRad2Deg);
+    fPointPos->SetReadyToSave();
+    return kTRUE;    
+  }
 
   //-------------------------------------------------------------------
@@ -652 +672 @@
         << fStars << ",  fRuns = " << fRuns << ",  fRows = " << fRows
         << ",  fSize = " << fSize << endl;
-  *fLog << "       first run : " << fRunNr[0] << ",  last run : "
-        << fRunNr[fRuns-1] << endl;
+  if (fRuns > 0)
+  {
+    *fLog << "       first run : " << fRunNr[0] << ",  last run : "
+          << fRunNr[fRuns-1] << endl;
+  }
 }
 
@@ -725 +748 @@
 
   fRuns += 1;
-  *fLog << fRuns <<"th run : " << ival << endl;  
+  //*fLog << fRuns <<"th run : " << ival << endl;  
 
   fRunNr.AddAt(ival, fRuns-1);

trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.h

@@ -30 +30 @@
 class MRawRunHeader;
 class MPointingPos;
+class MMcEvt;
 class MGeomCam;
 class MSrcPosCam;
@@ -40 +41 @@
     const MRawRunHeader *fRun;      //!
     const MGeomCam      *fGeomCam;  //! Camera Geometry used to calculate Hillas
+    MMcEvt              *fMcEvt;       //!
     MPointingPos        *fPointPos;       //!
     MSrcPosCam          *fSrcPos;         //!