Changeset 9234 for trunk/MagicSoft/Mars/msim

Timestamp:

01/21/09 14:26:15 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msim/MHPhotonEvent.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/msim/MHPhotonEvent.cc

@@ -44 +44 @@
 //
 // Type 3:
-//   The maximum in x and y is determined from MCamera->GetMaxR();
+//   The maximum in x and y is determined from MGeomCam->GetMaxR();
 //
 // Type 4:
 //   As type 3 but divided by 10.
 //
-// Type 5:
-//   The maximum in x and y is determined from MGeomCam->GetMaxR();
-//
-// Type 6:
-//   As type 5 but divided by 10.
-//
 // The binning is optimized using MH::FindGoodLimits. The number of bins
-// in 100 in the default case and 50 for type 3-6.
+// in 100 in the default case and 50 for type 3-4.
 //
 // Fill expects a MPhotonEvent (the second argumnet in MFillH).
@@ -78 +72 @@
 #include "MCorsikaRunHeader.h"
 
-#include "../msimreflector/MSimReflector.h" // MCamera, MReflector
+#include "MReflector.h"
 
 ClassImp(MHPhotonEvent);
@@ -198 +192 @@
     case 4:
         {
-            MCamera *c = (MCamera*)pList->FindObject("MCamera");
-            if (!c)
-            {
-                *fLog << err << "MCamera not found... aborting." << endl;
-                return kFALSE;
-            }
-            xmax = fType==3 ? c->GetMaxR() : c->GetMaxR()/10;
-            num  = 50;
-
-            break;
-        }
-    case 5:
-    case 6:
-        {
             MGeomCam *c = (MGeomCam*)pList->FindObject("MGeomCam");
             if (!c)
@@ -218 +198 @@
                 return kFALSE;
             }
-            xmax = fType==5 ? c->GetMaxRadius() : c->GetMaxRadius()/10;
+            xmax = fType==3 ? c->GetMaxRadius()/10 : c->GetMaxRadius()/100;
             num  = 50;