Some fixes

scripts/run_athena.sh

@@ -135,29 +135,29 @@ fi
 
 # If there is a GRID file then copy it to the directory where we run athena
 # First we need to construct the filename from the ecmEnergy (there might be more than 1 GRID files in the DSID dir)
-case "$ecmEnergy" in
-  14000|14000.)
+case "${ecmEnergy%.*}" in
+  14000)
     GRIDPREFIX="14TeV"
   ;;
-  13000|13000.)
+  13000)
     GRIDPREFIX="13TeV"
   ;;
-  13600+|13600.)
+  13600)
     GRIDPREFIX="13p6TeV"
   ;;
-  8000|8000.)
+  8000)
     GRIDPREFIX="8TeV"
   ;;
-  8160|8160.)
+  8160)
     GRIDPREFIX="8p16TeV"
   ;;
-  7000|7000.)
+  7000)
     GRIDPREFIX="7TeV"
   ;;
-  5000|5000.)
+  5020)
     GRIDPREFIX="5TeV"
   ;;
-  2760|2760.)
+  2760)
     GRIDPREFIX="2p76TeV"
   ;;
   *)