removed setups for prepath

ConfigParser/ParserBase.cc

@@ -83,8 +83,6 @@ ParserBase::ParserBase(int argc,char **argv)
   ,_noInterScattPoints(0)
   ,_intitial4VecStr("")
   ,_projectile4VecStr("")
-  ,_prePathDataFiles("")
-  ,_prePathKMatrixFiles("")
   ,_scalingWithChannelID(false)
   ,_fixAllPhases(false)
   ,_nllScalingFactor(1.)
@@ -163,8 +161,6 @@ ParserBase::ParserBase(int argc,char **argv)
     ("name",po::value<string>(&_outputFileNameSuffix), "name that is attached to all otuput file names")
     ("pdgTableFile",po::value<string>(&_pdgTableFile), "path of the pdg-table file relative to the top dir")
     ("randomSeed",po::value<int>(&_randomSeed),  "random seed")
-    ("prePathDataFiles",po::value<string>(&_prePathDataFiles), "option to set a pre path to the data files")
-    ("prePathKMatrixFiles",po::value<string>(&_prePathKMatrixFiles), "option to set a pre path to the K-matrix files")
     ("scalingWithChannelID",po::value<bool>(&_scalingWithChannelID), "scaling with suffix for channel IDs")
     ("fixAllPhases",po::value<bool>(&_fixAllPhases), "option to fix all phases")
     ("singleChannelId",po::value<unsigned int>(&_singleChannelId), "preferred single channel ID e.g. when running QA")
@@ -329,8 +325,6 @@ bool ParserBase::parseCommandLine(int argc, char **argv)
                 << "no of interpolated scattering points: " << _noInterScattPoints << "\n\n"
 		<< "initial 4vector: " << _intitial4VecStr << "\n\n"
 		<< "projectile 4vector: " << _projectile4VecStr << "\n\n"
-		<< "prePathDataFiles: " << _prePathDataFiles << "\n\n"
-		<< "prePathKMatrixFiles: " << _prePathKMatrixFiles << "\n\n"
 		<< "scalingWithChannelID: " <<  _scalingWithChannelID << "\n\n"
 		<< "fixAllPhases: " << _fixAllPhases << "\n\n"
 		<< "singleChannelId: " << _singleChannelId << "\n\n"

ConfigParser/ParserBase.hh

@@ -124,8 +124,6 @@ public:
   const std::vector<std::string>& addKmatrixProdSuffix() const {return _kMatrixProdSuffix;}
   const std::string intitial4Vec() const {return _intitial4VecStr;}
   const std::string projectile4Vec() const {return _projectile4VecStr;}
-  const std::string prePathDataFiles() const {return _prePathDataFiles;}
-  const std::string prePathKMatrixFiles() const {return _prePathKMatrixFiles;}
   const bool scalingWChannelID() const {return _scalingWithChannelID;}
   const bool fixAllPhases() const {return _fixAllPhases;}
   const double nllScalingFactor() const {return _nllScalingFactor;}
@@ -226,8 +224,6 @@ protected:
   std::vector<std::string> _kMatrixProdSuffix;
   std::string _intitial4VecStr;
   std::string _projectile4VecStr;
-  std::string _prePathDataFiles;
-  std::string _prePathKMatrixFiles;
   bool _scalingWithChannelID;
   bool _fixAllPhases;
   double _nllScalingFactor;

PwaApps/singleChannelApp.cc

@@ -33,7 +33,6 @@
 #include <iterator>
 #include <memory>
 
-#include "Utils/PawianIOUtils.hh"
 #include "PwaUtils/AbsLh.hh"
 #include "FitParams/PwaCovMatrix.hh"
 #include "AppUtils/AppBase.hh"
@@ -216,13 +215,13 @@ int main(int __argc,char *__argv[]){
   // The following modes only need the primary channel data/mc and lh ptr
   std::shared_ptr<AbsLh> theLhPtr = GlobalEnv::instance()->Channel()->Lh();
 
-  const std::string datFile=PawianIOUtils::getFileName(GlobalEnv::instance()->evtStorePath(), GlobalEnv::instance()->parser()->dataFile());
+  const std::string datFile=GlobalEnv::instance()->parser()->dataFile();
   InfoMsg << "data file: " << datFile << endmsg;
   std::vector<std::string> dataFileNames;
   dataFileNames.push_back(datFile);
 
 
-  const std::string mcFile=PawianIOUtils::getFileName(GlobalEnv::instance()->evtStorePath(), GlobalEnv::instance()->parser()->mcFile());
+  const std::string mcFile=GlobalEnv::instance()->parser()->mcFile();
   std::vector<std::string> mcFileNames;
   if(!isPiPiScatteringChannel) {
     InfoMsg << "mc file: " << mcFile << endmsg;
@@ -313,7 +312,8 @@ int main(int __argc,char *__argv[]){
 	    << endmsg;
       exit(1);
     }
-    const std::string truthFile=PawianIOUtils::getFileName(GlobalEnv::instance()->evtStorePath(), GlobalEnv::instance()->parser()->truthFile());
+
+    const std::string truthFile=GlobalEnv::instance()->parser()->truthFile();
     int ratioTruthToMc= GlobalEnv::instance()->parser()->ratioTruthToMc();
     int maxTruthEvts=eventsData.size()*ratioMcToData*ratioTruthToMc;
     InfoMsg << "truth file: " << truthFile << endmsg;

PwaUtils/AbsDecay.cc

@@ -419,8 +419,7 @@ void AbsDecay::enableDynamics(std::string& dynString, std::vector<std::string>&
 
   if(_dynType=="KMatrix" || _dynType=="TMatrix" || _dynType=="TMatrixCompare" || _dynType=="FVectorCompare" 
      || _dynType=="FVectorIntensity" || _dynType=="Omnes"){
-    std::string prePathKMat=GlobalEnv::instance()->Channel(_channelId)->parser()->prePathKMatrixFiles();
-    _pathParserFile=prePathKMat+additionalStringVec[0];
+    _pathParserFile=additionalStringVec[0];
     if (additionalStringVec.size() == 3) 
       _projectionParticleNames=additionalStringVec.at(1)+"\t"+additionalStringVec.at(2);
   }