Change default transient definition

Default transient definition: subhalos that belong to main branches whose particle number at birth is above 10 times the minimum particle number for a structure
ICRAR · Aug 7, 2024 · 4f3aa4b · 4f3aa4b
1 parent d1d6d24
commit 4f3aa4b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/include/execution.h b/include/execution.h
@@ -98,12 +98,12 @@ class ExecutionParameters {
 
         // how the transients are defined
         enum TransientDefinition {
-	        ZDEP_3SIGMA = 0,
+	        CONST_10MINPART = 0,
 	        CONST_200,
-		CONST_10MINPART
+	        ZDEP_3SIGMA
 	};
 
-        TransientDefinition define_transient = ZDEP_3SIGMA;
+        TransientDefinition define_transient = CONST_10MINPART;
 };
 
 } // namespace shark

diff --git a/src/execution.cpp b/src/execution.cpp
@@ -77,18 +77,18 @@ template <>
 ExecutionParameters::TransientDefinition                                                                                                                                                                 
 Options::get<ExecutionParameters::TransientDefinition>(const std::string &name, const std::string &value) const {
         auto lvalue = lower(value);
-	if (lvalue == "zdep_3sigma") {
-	        return ExecutionParameters::ZDEP_3SIGMA;
+	if (lvalue == "const_10minpart") {
+	        return ExecutionParameters::CONST_10MINPART;
         }
 	else if (lvalue == "const_200") {
 	        return ExecutionParameters::CONST_200;
         }
-	if (lvalue == "const_10minpart") {
-	        return ExecutionParameters::CONST_10MINPART;
+	else if (lvalue == "zdep_3sigma") {
+	        return ExecutionParameters::ZDEP_3SIGMA;
         }
 
         std::ostringstream os;
-        os << name << " option value invalid: " << value << ". Supported values are zdep_3sigma, const_200, const_10minpart";
+        os << name << " option value invalid: " << value << ". Supported values are const_10minpart, const_200, zdep_3sigma";
         throw invalid_option(os.str());
 }