print warning if SLHA block name is not a symbol

FlexibleSUSY · Jan 31, 2016 · 0920e0b · 0920e0b
1 parent cee5fcf
commit 0920e0b
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/meta/WriteOut.m b/meta/WriteOut.m
@@ -485,21 +485,30 @@
            Return[result];
           ];
 
-ReadSLHAOutputBlock[{parameter_, {blockName_Symbol, pdg_?NumberQ}}] :=
-    Module[{result, blockNameStr, parmStr, pdgStr, gutNorm = ""},
-           blockNameStr = ToString[blockName];
+ReadSLHAOutputBlock[{parameter_, {blockName_String, pdg_?NumberQ}}] :=
+    Module[{result, parmStr, pdgStr, gutNorm = ""},
            parmStr = CConversion`ToValidCSymbolString[parameter];
            pdgStr = ToString[pdg];
            If[parameter === SARAH`hyperchargeCoupling,
               gutNorm = " * " <> CConversion`RValueToCFormString[
                   1/Parameters`GetGUTNormalization[parameter]];
              ];
            result = "model.set_" <> parmStr <>
-                    "(slha_io.read_entry(\"" <> blockNameStr <> "\", " <>
+                    "(slha_io.read_entry(\"" <> blockName <> "\", " <>
                     pdgStr <> ")" <> gutNorm <> ");\n";
            Return[result];
           ];
 
+ReadSLHAOutputBlock[{parameter_, {blockName_Symbol, pdg_?NumberQ}}] :=
+    ReadSLHAOutputBlock[{parameter, {ToString[blockName], pdg}}];
+
+ReadSLHAOutputBlock[{parameter_, {blockName_, pdg_?NumberQ}}] :=
+    Block[{},
+          Print["Warning: SLHA block name is not a symbol: ", blockName];
+          Print["   I'm using: ", CConversion`RValueToCFormString[blockName]];
+          ReadSLHAOutputBlock[{parameter, {CConversion`RValueToCFormString[blockName], pdg}}]
+         ];
+
 ReadSLHAOutputBlock[{parameter_, blockName_Symbol}] :=
     Module[{paramStr, blockNameStr},
            paramStr = CConversion`ToValidCSymbolString[parameter];