lib/trinitycrmod/trinity_gs2.rb in trinitycrmod-0.7.4 vs lib/trinitycrmod/trinity_gs2.rb in trinitycrmod-0.7.5

- old
+ new

@@ -88,10 +88,10 @@ end # Generates the component runs for GS2 and returns the hash # Raises an error if flux_option != "gs2" def flux_runs - raise FluxOptionError.new("flux_runs called and flux_option != gs2 or gryfx") if not flux_gs2? or flux_gryfx? + raise FluxOptionError.new("flux_runs called and flux_option != gs2 or gryfx") if not (flux_gs2? or flux_gryfx?) #puts "2@COMMMMMMMMMMMMMPOOOOOOOOOOOOOONNNETN", @component_runs generate_component_runs if not (@component_runs and @component_runs.size == n_flux_tubes) #p ["@COMMMMMMMMMMMMMPOOOOOOOOOOOOOONNNETN", @component_runs]