Merge pull request #14 from VinzenzBildstein/master

Small improvements and bug fixes

Author: VinzenzBildstein

Converter.cc

@@ -205,7 +205,11 @@ bool Converter::Run() {
 			fCryNumber = 0;
 		}
 		//create energy-resolution smeared energy
-		smearedEnergy = fRandom.Gaus(fDepEnergy,fSettings->Resolution(fSystemID,fDetNumber,fCryNumber,fDepEnergy));
+		if(fSettings->DontSmearEnergy()) {
+			smearedEnergy = fDepEnergy;
+		} else {
+			smearedEnergy = fRandom.Gaus(fDepEnergy,fSettings->Resolution(fSystemID,fDetNumber,fCryNumber,fDepEnergy));
+		}
 
 		if((fSettings->SortNumberOfEvents()==0)||(fSettings->SortNumberOfEvents()>=fEventNumber) ) {
 			//if the hit is above the threshold, we add it to the vector
@@ -261,8 +265,8 @@ bool Converter::Run() {
 						//fFragments[address].SetCcLong();
 						//fFragments[address].SetCcShort();
 						fFragments[address].SetCfd(0);
-						fFragments[address].SetCharge(smearedEnergy*700);
-						fFragments[address].SetKValue(700);
+						fFragments[address].SetCharge(smearedEnergy*fKValue);
+						fFragments[address].SetKValue(fKValue);
 						fFragments[address].SetMidasId(fFragmentTreeEntries);
 						// fTime is the time from the beginning of the event in seconds
 						fFragments[address].SetMidasTimeStamp(fTime); 

NTuple2EventTree.cc

@@ -34,17 +34,8 @@ int main(int argc, char** argv) {
     //-------------------- check flags and arguments --------------------
     interface.CheckFlags(argc, argv);
 
-    bool missingFlags = false;
-    if(settingsFileName.empty()) {
-        std::cerr<<"Missing a settings file name!"<<std::endl;
-        missingFlags = true;
-    }
     if(inputFileNames.size() == 0) {
         std::cerr<<"Missing input file name(s)!"<<std::endl;
-        missingFlags = true;
-    }
-
-    if(missingFlags) {
         return 1;
     }
 

Settings.cc

@@ -6,7 +6,11 @@
 Settings::Settings(std::string fileName, int verbosityLevel)
     : fVerbosityLevel(verbosityLevel) {
     TEnv env;
-    env.ReadFile(fileName.c_str(),kEnvLocal);
+	 if(fileName.empty()) {
+		 std::cout<<"Warning, no settings file provided, using default values!"<<std::endl;
+	 } else {
+		 env.ReadFile(fileName.c_str(),kEnvLocal);
+	 }
 
     fNtupleName = env.GetValue("NtupleName","/ntuple");
 
@@ -18,13 +22,15 @@ Settings::Settings(std::string fileName, int verbosityLevel)
 
 	 fKValue = env.GetValue("KValue", 700);
 
-    fWriteGriffinAddbackVector = env.GetValue("WriteGriffinAddbackVector",false);
+	 fDontSmearEnergy = env.GetValue("DontSmearEnergy", false);
 
-    fGriffinAddbackVectorLengthmm = env.GetValue("GriffinAddbackVectorLengthmm",105.0);
+    fWriteGriffinAddbackVector = env.GetValue("WriteGriffinAddbackVector", false);
 
-    fGriffinAddbackVectorDepthmm = env.GetValue("GriffinAddbackVectorDepthmm",45.0);
+    fGriffinAddbackVectorLengthmm = env.GetValue("GriffinAddbackVectorLengthmm", 105.0);
 
-    fGriffinAddbackVectorCrystalFaceDistancemm = env.GetValue("GriffinAddbackVectorCrystalFaceDistancemm",110.0);
+    fGriffinAddbackVectorDepthmm = env.GetValue("GriffinAddbackVectorDepthmm", 45.0);
+
+    fGriffinAddbackVectorCrystalFaceDistancemm = env.GetValue("GriffinAddbackVectorCrystalFaceDistancemm", 110.0);
 
     // Griffin
     fResolution[1000].resize(16);

Settings.hh

@@ -26,6 +26,8 @@ public:
 
     bool WriteGriffinAddbackVector() { return fWriteGriffinAddbackVector; }
 
+	 bool DontSmearEnergy() { return fDontSmearEnergy; }
+
     double GriffinAddbackVectorLengthmm() { return fGriffinAddbackVectorLengthmm; }
 
     double GriffinAddbackVectorDepthmm() { return fGriffinAddbackVectorDepthmm; }
@@ -67,6 +69,7 @@ private:
     bool fWriteTree;
 	 int fKValue;
     bool fWriteGriffinAddbackVector;
+	 bool fDontSmearEnergy;
 
     double fGriffinAddbackVectorLengthmm;
     double fGriffinAddbackVectorDepthmm;