Functions ReadFissile and ReadFertile was doing the exact opposite of what...

Functions ReadFissile and ReadFertile was doing the exact opposite of what their supposed to dosvn status

git-svn-id: svn+ssh://svn.in2p3.fr/class@716 0e7d625b-0364-4367-a6be-d5be4a48d228

source/branches/BaM_Dev/src/EquivalenceModel.cxx

@@ -146,62 +146,62 @@ void EquivalenceModel::ReadFissil(const string &line)
 	int Z = atoi(StringLine::NextWord(line, pos, ' ').c_str());
 	int A = atoi(StringLine::NextWord(line, pos, ' ').c_str());
 	int I = atoi(StringLine::NextWord(line, pos, ' ').c_str());
-	double Q = atof(StringLine::NextWord(line, pos, ' ').c_str());
 	
-	fFertileList.Add(Z, A, I, Q);
+	fFissileList.Add(Z, A, I, 1.0);
 	
 	DBGL
 }
 //________________________________________________________________________
-void EquivalenceModel::ReadSpecificPower(const string &line)
+void EquivalenceModel::ReadFertil(const string &line)
 {
 	DBGL
 	int pos = 0;
 	string keyword = tlc(StringLine::NextWord(line, pos, ' '));
-	if( keyword != "k_specpower")	// Check the keyword
+	if( keyword != "k_fertil" )	// Check the keyword
 	{
-		ERROR << " Bad keyword : \"k_specpower\" Not found !" << endl;
+		ERROR << " Bad keyword : \"k_fertil\" not found !" << endl;
 		exit(1);
 	}
 	
-	fSpecificPower = atof(StringLine::NextWord(line, pos, ' ').c_str());
+	int Z = atoi(StringLine::NextWord(line, pos, ' ').c_str());
+	int A = atoi(StringLine::NextWord(line, pos, ' ').c_str());
+	int I = atoi(StringLine::NextWord(line, pos, ' ').c_str());
+	double Q = atof(StringLine::NextWord(line, pos, ' ').c_str());
+
+	fFertileList.Add(Z, A, I, Q);
+
 	
 	DBGL
 }
 //________________________________________________________________________
-void EquivalenceModel::ReadMaximalContent(const string &line)
+void EquivalenceModel::ReadSpecificPower(const string &line)
 {
 	DBGL
 	int pos = 0;
-	string keyword = tlc(StringLine::NextWord(line, pos, ' ').c_str());
-	if( keyword != "k_contentmax")	// Check the keyword
+	string keyword = tlc(StringLine::NextWord(line, pos, ' '));
+	if( keyword != "k_specpower")	// Check the keyword
 	{
-		ERROR << " Bad keyword : \"k_contentmax\" Not found !" << endl;
+		ERROR << " Bad keyword : \"k_specpower\" Not found !" << endl;
 		exit(1);
 	}
 	
-	fMaximalContent = atof(StringLine::NextWord(line, pos, ' ').c_str());
+	fSpecificPower = atof(StringLine::NextWord(line, pos, ' ').c_str());
 	
 	DBGL
 }
 //________________________________________________________________________
-void EquivalenceModel::ReadFertil(const string &line)
+void EquivalenceModel::ReadMaximalContent(const string &line)
 {
 	DBGL
 	int pos = 0;
-	string keyword = tlc(StringLine::NextWord(line, pos, ' '));
-	if( keyword != "k_fertil" )	// Check the keyword
+	string keyword = tlc(StringLine::NextWord(line, pos, ' ').c_str());
+	if( keyword != "k_contentmax")	// Check the keyword
 	{
-		ERROR << " Bad keyword : \"k_fertil\" not found !" << endl;
+		ERROR << " Bad keyword : \"k_contentmax\" Not found !" << endl;
 		exit(1);
 	}
 	
-	int Z = atoi(StringLine::NextWord(line, pos, ' ').c_str());
-	int A = atoi(StringLine::NextWord(line, pos, ' ').c_str());
-	int I = atoi(StringLine::NextWord(line, pos, ' ').c_str());
-	
-	fFissileList.Add(Z, A, I, 1.0);
-
+	fMaximalContent = atof(StringLine::NextWord(line, pos, ' ').c_str());
 	
 	DBGL
 }