Revert "New constructor and LoadConfigFile returns vector"

This reverts commit 536dcf09

Analysis/src/DataReader.cpp

@@ -28,15 +28,6 @@ DataReader::DataReader() : DataReader( 0, 0, "", 0 ){
 
 }
 
-/** @brief Constructor for DataReader.
- *
- *  @param1 Run number being used.
- */
-DataReader::DataReader( const uint runNum )
-  : m_runNumber( runNum ), m_readListOfFiles( false ), m_fIn( NULL ){
-
-}
-
 /** @brief Constructor for DataReader.
  *
  *  @param1 Number of channels being read
@@ -112,7 +103,7 @@ void DataReader::ReadListOfFiles( std::string listname ){
     m_fListOfFiles = listname;
 }
 
-vector< Channel > DataReader::LoadConfigurationFile(std::string _inFile = "${JCaPA}/Utils/ConfigFile2018.xml"){
+void DataReader::LoadConfigurationFile(std::string _inFile){
 
     //Temporary implementation - objects will be just created within this method and loaded here.
     //TODO: incorporate them in a data-member or better in a ZDC and RPD objects inheriting from a Detector class and return them
@@ -135,7 +126,7 @@ vector< Channel > DataReader::LoadConfigurationFile(std::string _inFile = "${JCa
         m_XMLparser->getChildValue("channel",i,"end_run",last_run);
 
         //Discard entries for any channel that does not apply to our run
-        if(m_runNumber > first_run || m_runNumber < last_run) continue;
+        if(m_runNumber < first_run || m_runNumber > last_run) continue;
 
         //If the entry applies, we store it in the vector
         m_XMLparser->getChildValue("channel",i,"detector",buffer_ch.detector);
@@ -153,7 +144,7 @@ vector< Channel > DataReader::LoadConfigurationFile(std::string _inFile = "${JCa
 
     std::cout << "Loaded " << channelEntries.size() << " configuration entries " << std::endl;
 
-	return channelEntries;
+
 }