Merge remote-tracking branch 'organization/development' into feature-…

…tachyons
FlexibleSUSY · Mar 23, 2018 · 4102dde · 4102dde
2 parents 69fbdeb + a2bd886
commit 4102dde
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/examples/customized-betas/custombetas.cpp b/examples/customized-betas/custombetas.cpp
@@ -98,11 +98,8 @@ int main(int argc, char* argv[])
    if (!problems.have_problem())
       slha_io.set_spectrum(model);
 
-   if (slha_output_file.empty()) {
-      slha_io.write_to_stream(std::cout);
-   } else {
-      slha_io.write_to_file(slha_output_file);
-   }
+   if (!slha_output_file.empty())
+      slha_io.write_to(slha_output_file);
 
    if (!spectrum_file.empty())
       spectrum_generator.write_spectrum(spectrum_file);

diff --git a/meta/CXXDiagrams.m b/meta/CXXDiagrams.m
@@ -441,15 +441,6 @@
                                   If[Length[remainingIndices] === 0, Head[p],
                                      Head[p][remainingIndices]]
                                   ];
-
-FieldInfo[field_,OptionsPattern[{includeLorentzIndices -> False}]] := 
-    Module[{fieldInfo = Cases[SARAH`Particles[FlexibleSUSY`FSEigenstates],
-                                {SARAH`getParticleName @ field, ___}][[1]]},
-            fieldInfo = DeleteCases[fieldInfo, {SARAH`generation, 1}, {2}];
-            If[!OptionValue[includeLorentzIndices],
-               DeleteCases[fieldInfo, {SARAH`lorentz, _}, {2}],
-               fieldInfo]
-          ]
 
 End[];
 EndPackage[];
diff --git a/meta/TreeMasses.m b/meta/TreeMasses.m
@@ -151,6 +151,8 @@
 CreateDependencePrototypes::usage="";
 CreateDependenceFunctions::usage="";
 
+ColorChargedQ::usage="";
+FieldInfo::usage="";
 IsScalar::usage="";
 IsFermion::usage="";
 IsVector::usage="";
@@ -273,6 +275,15 @@
 ParticleQ[p_, states_:FlexibleSUSY`FSEigenstates] :=
     MemberQ[GetParticles[states], p];
 
+FieldInfo[field_,OptionsPattern[{includeLorentzIndices -> False}]] :=
+    Module[{fieldInfo = Cases[SARAH`Particles[FlexibleSUSY`FSEigenstates],
+                                {SARAH`getParticleName @ field, ___}][[1]]},
+            fieldInfo = DeleteCases[fieldInfo, {SARAH`generation, 1}, {2}];
+            If[!OptionValue[includeLorentzIndices],
+               DeleteCases[fieldInfo, {SARAH`lorentz, _}, {2}],
+               fieldInfo]
+          ]
+
 IsOfType[sym_Symbol, type_Symbol, states_:FlexibleSUSY`FSEigenstates] :=
     SARAH`getType[sym, False, states] === type;
 
@@ -383,8 +394,11 @@
 ContainsMassless[sym_List, states_:FlexibleSUSY`FSEigenstates] :=
     Or @@ (IsMassless[#,states]& /@ sym);
 
+ColorChargedQ[field_] :=
+    !FreeQ[FieldInfo[field], SARAH`color];
+
 GetColoredParticles[] :=
-    Select[GetParticles[], (SA`Dynkin[#, Position[SARAH`Gauge, SARAH`color][[1,1]]] =!= 0)&];
+    Select[GetParticles[], ColorChargedQ];
 
 IsQuark[Susyno`LieGroups`conj[sym_]] := IsQuark[sym];
 IsQuark[SARAH`bar[sym_]] := IsQuark[sym];