Changeset 18546 for trunk/Mars/mcorsika

Timestamp:

08/26/16 12:58:47 (8 years ago)

Author:

tbretz

Message:

In EventIO the impact is not calculated on the ground, the trajectory option is detected differently, the cherenkov flag is output also as a hex number

File:

• trunk/Mars/mcorsika/MCorsikaRunHeader.cc (modified) (4 diffs)

trunk/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -114 +114 @@
 
     // CORSIKA scattering in a disc on the ground
-    if (f[246]>0 && f[247]==0)
+    if (f[246]>0 && f[247]==0 && !fInFormat->IsEventioFormat())
     {
         *fLog << warn << "WARNING - Events scattered in a disc on the ground." << endl;
@@ -263 +263 @@
         *fLog << "ViewCone:       " << fViewConeInnerAngle << UTF8::kDeg << " - " << fViewConeOuterAngle << UTF8::kDeg << endl;
 
-    if (fZdMax>=0)
+    *fLog << "Zd/Az:          ";
+    if (fZdMax>=0 && fZdMin<360)
     {
-        *fLog << "Zd/Az:          " << fZdMin << UTF8::kDeg;
+        *fLog << fZdMin << UTF8::kDeg;
         if (fZdMin==fZdMax)
             *fLog << " (fixed)";
@@ -272 +273 @@
         *fLog << " / " << fAzMin << UTF8::kDeg;
         if (fAzMin==fAzMax)
-            *fLog << (fAzMin==180?" (trajectory)":" (fixed)");
+            *fLog << " (fixed)";
         else
             *fLog << "-" << fAzMax << UTF8::kDeg;
         *fLog << "  w.r.t. magnetic North." << endl;
     }
+
+    if (fZdMin>=360) // 4010.7
+        *fLog << "-trajectory-" << endl;
+
 
     if (fImpactMax>0)
@@ -298 +303 @@
     if (Has(kSlant))
         *fLog << " SLANT";
-    *fLog << endl;
+    *fLog << " [" << hex << fCerenkovFlag << "]" << dec << endl;
 
     if (HasLayers())