Merge branch 'fix-1.2.0'

Conflicts:
	src/utils/RootAnalysis.cxx
	src/utils/RootAnalysis.hxx

Author: dragontriumf

src/utils/RootAnalysis.cxx

@@ -100,12 +100,12 @@ template <class T> void Zap(T*& t)
 
 // ============ namespace dragon Free Functions ============ //
 
-void dragon::MakeChains(const Int_t* runnumbers, Int_t nruns, Bool_t sonik, const char* format)
+void dragon::MakeChains(const Int_t* runnumbers, Int_t nruns, const char* format, Bool_t sonik)
 {
-	MakeChains("t", runnumbers, nruns, sonik, format);
+	MakeChains("t", runnumbers, nruns, format, sonik);
 }
 
-void dragon::MakeChains(const char* prefix, const Int_t* runnumbers, Int_t nruns, Bool_t sonik, const char* format)
+void dragon::MakeChains(const char* prefix, const Int_t* runnumbers, Int_t nruns, const char* format, Bool_t sonik)
 {
 	///
 	/// \param [in] runnumbers Pointer to a valid array of desired run numbers to chain together.
@@ -152,20 +152,21 @@ void dragon::MakeChains(const char* prefix, const Int_t* runnumbers, Int_t nruns
 		chain[6]->SetName(Form("%s6",  prefix));
 		chain[7]->SetName(Form("%s7",  prefix));
 	}
+	
 	else{
 		TChain* chain[] = {
 			new TChain(Form("%s0",  "t"), "SONIK event."),
 			// new TChain(Form("%s1",  "t"), "Head singles event."), Head DAQ not used with SONIK
 			// new TChain(Form("%s2",  "t"), "Head scaler event."),
 			new TChain(Form("%s3",  "t"), "Tail singles event."),
 			new TChain(Form("%s4",  "t"), "Tail scaler event."),
-			// new TChain(Form("%s5",  "t"), "Coincidence event."), coincidence events not used with SONIK
+			// new TChain(Form("%s5",  "t"), "Coincidence event."), Coincidence events N/A for SONIK
 			new TChain(Form("%s20", "t"), "Epics event."),
 			new TChain(Form("%s6",  "t"), "Timestamp diagnostics."),
 			new TChain(Form("%s7",  "t"), "Glocal run parameters.")
 		};
 		Int_t nchains = sizeof(chain) / sizeof(TChain*);
-
+	
 		for(Int_t i=0; i< nruns; ++i) {
 			char fname[4096];
 			sprintf(fname, format, runnumbers[i]);
@@ -183,29 +184,29 @@ void dragon::MakeChains(const char* prefix, const Int_t* runnumbers, Int_t nruns
 		}
 
 		chain[0]->SetName(Form("%s0",  prefix));
-		// chain[1]->SetName(Form("%s1",  prefix));
-		// chain[2]->SetName(Form("%s2",  prefix));
+		// chain[0]->SetName(Form("%s1",  prefix));
+		// chain[1]->SetName(Form("%s2",  prefix));
 		chain[1]->SetName(Form("%s3",  prefix));
 		chain[2]->SetName(Form("%s4",  prefix));
-		// chain[5]->SetName(Form("%s5",  prefix));
+		// chain[4]->SetName(Form("%s5",  prefix));
 		chain[3]->SetName(Form("%s20", prefix));
 		chain[4]->SetName(Form("%s6",  prefix));
-		chain[5]->SetName(Form("%s7",  prefix));
+		chain[5]->SetName(Form("%s7",  prefix));		
 	}
 }
 
-void dragon::MakeChains(const char* prefix, const std::vector<Int_t>& runnumbers, Bool_t sonik, const char* format)
+void dragon::MakeChains(const char* prefix, const std::vector<Int_t>& runnumbers, const char* format, Bool_t sonik)
 {
-	MakeChains(prefix, &runnumbers[0], runnumbers.size(), sonik, format);
+	MakeChains(prefix, &runnumbers[0], runnumbers.size(), format, sonik);
 }
 
-void dragon::MakeChains(const std::vector<Int_t>& runnumbers, Bool_t sonik, const char* format)
+void dragon::MakeChains(const std::vector<Int_t>& runnumbers, const char* format, Bool_t sonik)
 {
 	///
 	/// \param runnumbers vector of desired run numbers
 	/// \param format same as the other version
 	///
-	MakeChains(&runnumbers[0], runnumbers.size(), sonik, format);
+	MakeChains(&runnumbers[0], runnumbers.size(), format, sonik);
 }
 
 void dragon::FriendChain(TChain* chain, const char* friend_name, const char* friend_alias,
@@ -2174,6 +2175,7 @@ UDouble_t dragon::StoppingPowerCalculator::CalculateEpsilon(TGraph** plot, UDoub
 
 		double md1err = fMd1[i].GetErrLow() < fMd1[i].GetErrHigh() ?
 																					fMd1[i].GetErrHigh() : fMd1[i].GetErrLow();
+
 		dens[i] = CalculateDensity(fPressures[i], UDouble_t(fTargetLength.GetNominal(), 0), fNmol, fTemp);
 		energy[i] = CalculateEnergy(fMd1[i].GetNominal(), md1err, fBeamCharge, fBeamMass, fMd1Constant.GetNominal(), 0);
 	}

src/utils/RootAnalysis.hxx

@@ -42,16 +42,16 @@ enum MeasurementType_t {
 };
 
 /// Chain together all trees in multiple DRAGON files.
-void MakeChains(const char* prefix, const Int_t* runnumbers, Int_t nruns, Bool_t sonik = kFALSE, const char* format = "$DH/rootfiles/run%d.root");
+void MakeChains(const char* prefix, const Int_t* runnumbers, Int_t nruns, const char* format = "$DH/rootfiles/run%d.root", Bool_t sonik = kFALSE);
 
 /// Chain together all trees in multiple DRAGON files.
-void MakeChains(const Int_t* runnumbers, Int_t nruns, Bool_t sonik = kFALSE, const char* format = "$DH/rootfiles/run%d.root");
+void MakeChains(const Int_t* runnumbers, Int_t nruns, const char* format = "$DH/rootfiles/run%d.root", Bool_t sonik = kFALSE);
 
 /// Chain together trees using a vector instead of array
-void MakeChains(const std::vector<Int_t>& runnumbers, Bool_t sonik = kFALSE, const char* format = "$DH/rootfiles/run%d.root");
+void MakeChains(const std::vector<Int_t>& runnumbers, const char* format = "$DH/rootfiles/run%d.root", Bool_t sonik = kFALSE);
 
 /// Chain together trees using a vector instead of array
-void MakeChains(const char* prefix, const std::vector<Int_t>& runnumbers, Bool_t sonik = kFALSE, const char* format = "$DH/rootfiles/run%d.root");
+void MakeChains(const char* prefix, const std::vector<Int_t>& runnumbers, const char* format = "$DH/rootfiles/run%d.root", Bool_t sonik = kFALSE);
 
 /// Add another chain of files as a friend to an existing one
 void FriendChain(TChain* chain, const char* friend_name, const char* friend_alias,