Changeset 7565 for trunk/MagicSoft/Mars

Timestamp:

03/03/06 11:45:07 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mpointing/MSrcPosRndm.cc (modified) (4 diffs)
• mpointing/MSrcPosRndm.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/03/03 Thomas Bretz
+
+   * mjobs/MJCut.cc:
+     - added RemoveFromList for srcposrndm in off-data loop
+
+   * mpointing/MSrcPosRndm.[h,cc]:
+     - fixed the scaling. MSrcPosCam has to be in mm
+
+
+
  2006/03/03 Daniel Hoehne
 

trunk/MagicSoft/Mars/mpointing/MSrcPosRndm.cc

@@ -41 +41 @@
 #include "MParList.h"
 
+#include "MGeomCam.h"
 #include "MSrcPosCam.h"
 #include "MHSrcPosCam.h"
@@ -54 +55 @@
 Int_t MSrcPosRndm::PreProcess(MParList *plist)
 {
+    MGeomCam *geom = (MGeomCam*)plist->FindObject("MGeomCam");
+    if (!geom)
+    {
+        *fLog << err << "ERROR - MGeomCam not found... aborting." << endl;
+        return kFALSE;
+    }
+
     fSrcPos = (MSrcPosCam*)plist->FindCreateObj("MSrcPosCam");
     if (!fSrcPos)
@@ -66 +74 @@
 
     *fLog << inf << "MHSrcPosCam found... taken to produce a random distribution." << endl;
+
+    fConvMm2Deg = geom->GetConvMm2Deg();
 
     return kTRUE;
@@ -80 +90 @@
     fHist->GetHist().GetRandom2(x, y);
 
-    fSrcPos->SetXY(x, y);
+    fSrcPos->SetXY(x/fConvMm2Deg, y/fConvMm2Deg);
 
     return kTRUE;

trunk/MagicSoft/Mars/mpointing/MSrcPosRndm.h

@@ -15 +15 @@
     MHSrcPosCam  *fHist;   //!
 
+    Double_t fConvMm2Deg;
+
     Int_t  PreProcess(MParList *plist);
     Int_t  Process();