use mass ratio instead of molar ratio

gui/CLASSRead.cxx

@@ -375,8 +375,8 @@ void CLASSRead::PlotInv(vector<CLASSPlotElement> toplot, bool DecayChain, int St
 	TH1F*	  fhr = fCNucleiInv->DrawFrame(Xmin,Ymin*0.95,Xmax,Ymax*1.05);
 	string Xtitle = "Time [year]";
 	string Ytitle = "Mass [kg]";
-	if(toplot[0].fIVNumber==3){//Only molar ratio are ploted
-		Ytitle = "Molar ratio";
+	if(toplot[0].fIVNumber==3){//Only mass ratio are ploted
+		Ytitle = "Mass ratio";
 	}
 	fhr->SetXTitle(Xtitle.c_str());
 	fhr->SetYTitle(Ytitle.c_str());
@@ -915,8 +915,8 @@ void CLASSRead::BuildTGraph(vector<CLASSPlotElement> toplot, int PlotId, string
 					ZAIQuantity = IV[toplot[i].fFacilityNumber]->GetZAIIsotopicQuantity(Z,A,I);
 				else if( toplot[i].fIVNumber ==  3 )
 				{
-					if(IV[toplot[i].fFacilityNumber]->GetSumOfAll()!=0)
-						ZAIQuantity = IV[toplot[i].fFacilityNumber]->GetZAIIsotopicQuantity(Z,A,I)/IV[toplot[i].fFacilityNumber]->GetSumOfAll();
+					if(IV[toplot[i].fFacilityNumber]->GetTotalMass()!=0)
+						ZAIQuantity = 1e-3*IV[toplot[i].fFacilityNumber]->GetZAIIsotopicQuantity(Z,A,I)/IV[toplot[i].fFacilityNumber]->GetTotalMass();
 				}
 				else if ( toplot[i].fIVNumber <  3 )
 				{
@@ -939,8 +939,8 @@ void CLASSRead::BuildTGraph(vector<CLASSPlotElement> toplot, int PlotId, string
 					ZAIQuantity = reactor[toplot[i].fFacilityNumber]->GetCumulativeIVOut().GetZAIIsotopicQuantity(Z,A,I);
 				else if( toplot[i].fIVNumber ==  3 )
 				{
-					if(reactor[toplot[i].fFacilityNumber]->GetInsideIV().GetSumOfAll()!=0)
-						ZAIQuantity = reactor[toplot[i].fFacilityNumber]->GetInsideIV().GetZAIIsotopicQuantity(Z,A,I)/reactor[toplot[i].fFacilityNumber]->GetInsideIV().GetSumOfAll();
+					if(reactor[toplot[i].fFacilityNumber]->GetInsideIV().GetTotalMass()!=0)
+						ZAIQuantity = 1e-3*reactor[toplot[i].fFacilityNumber]->GetInsideIV().GetZAIIsotopicQuantity(Z,A,I)/reactor[toplot[i].fFacilityNumber]->GetInsideIV().GetTotalMass();
 				}
 				else
 				{
@@ -958,8 +958,8 @@ void CLASSRead::BuildTGraph(vector<CLASSPlotElement> toplot, int PlotId, string
 					ZAIQuantity = stock[toplot[i].fFacilityNumber]->GetCumulativeIVOut().GetZAIIsotopicQuantity(Z,A,I);
 				else if( toplot[i].fIVNumber ==  3 )
 				{
-					if(stock[toplot[i].fFacilityNumber]->GetInsideIV().GetSumOfAll()!=0)
-						ZAIQuantity = stock[toplot[i].fFacilityNumber]->GetInsideIV().GetZAIIsotopicQuantity(Z,A,I)/stock[toplot[i].fFacilityNumber]->GetInsideIV().GetSumOfAll();
+					if(stock[toplot[i].fFacilityNumber]->GetInsideIV().GetTotalMass()!=0)
+						ZAIQuantity = 1e-3*stock[toplot[i].fFacilityNumber]->GetInsideIV().GetZAIIsotopicQuantity(Z,A,I)/stock[toplot[i].fFacilityNumber]->GetInsideIV().GetTotalMass();
 				}
 				else
 				{
@@ -977,8 +977,8 @@ void CLASSRead::BuildTGraph(vector<CLASSPlotElement> toplot, int PlotId, string
 					ZAIQuantity = pool[toplot[i].fFacilityNumber]->GetCumulativeIVOut().GetZAIIsotopicQuantity(Z,A,I);
 				else if( toplot[i].fIVNumber ==  3 )
 				{
-					if(pool[toplot[i].fFacilityNumber]->GetInsideIV().GetSumOfAll()!=0)
-						ZAIQuantity = pool[toplot[i].fFacilityNumber]->GetInsideIV().GetZAIIsotopicQuantity(Z,A,I)/pool[toplot[i].fFacilityNumber]->GetInsideIV().GetSumOfAll();
+					if(pool[toplot[i].fFacilityNumber]->GetInsideIV().GetTotalMass()!=0)
+						ZAIQuantity = 1e-3*pool[toplot[i].fFacilityNumber]->GetInsideIV().GetZAIIsotopicQuantity(Z,A,I)/pool[toplot[i].fFacilityNumber]->GetInsideIV().GetTotalMass();
 				}
 				else
 				{
@@ -996,8 +996,8 @@ void CLASSRead::BuildTGraph(vector<CLASSPlotElement> toplot, int PlotId, string
 					ZAIQuantity = fabricationplant[toplot[i].fFacilityNumber]->GetCumulativeIVOut().GetZAIIsotopicQuantity(Z,A,I);
 				else if( toplot[i].fIVNumber ==  3 )
 				{
-					if(fabricationplant[toplot[i].fFacilityNumber]->GetInsideIV().GetSumOfAll()!=0)
-						ZAIQuantity = fabricationplant[toplot[i].fFacilityNumber]->GetInsideIV().GetZAIIsotopicQuantity(Z,A,I)/fabricationplant[toplot[i].fFacilityNumber]->GetInsideIV().GetSumOfAll();
+					if(fabricationplant[toplot[i].fFacilityNumber]->GetInsideIV().GetTotalMass()!=0)
+						ZAIQuantity = 1e-3*fabricationplant[toplot[i].fFacilityNumber]->GetInsideIV().GetZAIIsotopicQuantity(Z,A,I)/fabricationplant[toplot[i].fFacilityNumber]->GetInsideIV().GetTotalMass();
 				}
 				else
 				{
@@ -1011,13 +1011,13 @@ void CLASSRead::BuildTGraph(vector<CLASSPlotElement> toplot, int PlotId, string
 				return;
 			}
 
-			if(PlotId ==  0 && toplot[i].fIVNumber !=3)
+			if(PlotId ==  0 )
 				ZAIQuantity *=  cZAIMass.GetMass(Z,A)/AVOGADRO*1e-3;
 			else if(PlotId ==  1)
 				ZAIQuantity *=  cZAITox.GetRadioTox(Z,A,I);
 			else if(PlotId ==  2)
 				ZAIQuantity *=  cZAIHeat.GetHeat(Z,A,I);
-			else if(PlotId !=  0)
+			else
 			{
 				cout << "Bad PlotId" << endl;
 				return;