Index: trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc	(revision 1330)
+++ trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc	(revision 1342)
@@ -159,9 +159,13 @@
 
         rate.SetParticle(fPartId);
-	if (fPartId ==14)
-	    rate.SetFlux(0.1091, 2.75);
-	else if (fPartId == 402)
-	    rate.SetFlux(0.0660, 2.62);
-	else {
+        switch (fPartId)
+        {
+        case kPROTON:
+            rate.SetFlux(0.1091, 2.75);
+            break;
+        case kHELIUM:
+            rate.SetFlux(0.0660, 2.62);
+            break;
+        default:
 	    *fLog << err << dbginf << "Unknown incident flux parameters for ";
 	    *fLog << fPartId<< " particle Id ... aborting." << endl;