diff --git a/ConfigParser/ParserBase.cc b/ConfigParser/ParserBase.cc index c32c7357a5c3c231c6533d74df5a7df56603d0b1..36a2eb03e32b40c87ea9526506f2ba5bbeb5448a 100644 --- a/ConfigParser/ParserBase.cc +++ b/ConfigParser/ParserBase.cc @@ -50,8 +50,8 @@ ParserBase::ParserBase(int argc,char **argv) , _noOfThreads(16) , _noOfClients(1) , _serverPort(22222) - , _ratioMcToData(100000) - , _ratioTruthToMc(100000) + , _ratioMcToData(100) + , _ratioTruthToMc(100) , _evoIterations(100) , _evoPopulation(20) , _evoRatioOfModParams(1.) @@ -128,8 +128,8 @@ ParserBase::ParserBase(int argc,char **argv) ("noOfThreads",po::value<int>(&_noOfThreads), "number of threads for multi threaded mode") ("noOfClients",po::value<int>(&_noOfClients), "number of clients/worker nodes for server mode") ("serverPort",po::value<int>(&_serverPort), "port for client/server mode") - ("ratioMcToData",po::value<int>(&_ratioMcToData), "number of MC events defined by ratio #MCs/#Data") - ("ratioTruthToMc",po::value<int>(&_ratioTruthToMc), "number of truth events defined by ratio #truths/#Mcs; needed only for qaModeEffCorrection") + ("ratioMcToData",po::value<short>(&_ratioMcToData), "number of MC events defined by ratio #MCs/#Data") + ("ratioTruthToMc",po::value<short>(&_ratioTruthToMc), "number of truth events defined by ratio #truths/#Mcs; needed only for qaModeEffCorrection") ("evoPopulation",po::value<int>(&_evoPopulation), "iteration population for evo minimizer") ("evoIterations",po::value<int>(&_evoIterations), "number of iterations for evo minimizer") ("evoRatioOfModParams",po::value<double>(&_evoRatioOfModParams), "chosen (avereaged) ratio of fit parameters to be changed for each population (value between 0. and 1.") diff --git a/ConfigParser/ParserBase.hh b/ConfigParser/ParserBase.hh index 274fe46108b34ef4234658b7f93b332420d6e364..d0a7226be495828ce772a7b90c453e675cfebd79 100644 --- a/ConfigParser/ParserBase.hh +++ b/ConfigParser/ParserBase.hh @@ -72,8 +72,8 @@ public: const int noOfThreads() const {return _noOfThreads;} const int noOfClients() const {return _noOfClients;} const int serverPort() const {return _serverPort;} - const int ratioMcToData() const {return _ratioMcToData;} - const int ratioTruthToMc() const {return _ratioTruthToMc;} + const short ratioMcToData() const {return _ratioMcToData;} + const short ratioTruthToMc() const {return _ratioTruthToMc;} const int evoPopulation() const {return _evoPopulation;} const int evoIterations() const {return _evoIterations;} const double evoRatioOfModParams() const {return _evoRatioOfModParams;} @@ -154,8 +154,8 @@ protected: int _noOfThreads; int _noOfClients; int _serverPort; - int _ratioMcToData; - int _ratioTruthToMc; + short _ratioMcToData; + short _ratioTruthToMc; int _evoIterations; int _evoPopulation; double _evoRatioOfModParams; diff --git a/PwaApps/singleChannelApp.cc b/PwaApps/singleChannelApp.cc index bf556b2c4d047834e81a693a750e6157504cae3d..90b3f52f5088a24757ffb49b0249a6802aa063d7 100644 --- a/PwaApps/singleChannelApp.cc +++ b/PwaApps/singleChannelApp.cc @@ -269,6 +269,13 @@ int main(int __argc,char *__argv[]){ theAppBase.readEvents(eventsData, dataFileNames, 0, GlobalEnv::instance()->Channel()->useDataEvtWeight(), 0, noOfDataEvents); int maxMcEvts=eventsData.size()*ratioMcToData; + // InfoMsg << "eventsData.size(): " << eventsData.size() << endmsg; + // InfoMsg << "ratioMcToData: " << ratioMcToData << endmsg; + // InfoMsg << "eventsData.size()*ratioMcToData: " << eventsData.size()*ratioMcToData << endmsg; + // InfoMsg << "double(eventsData.size()*ratioMcToData): " << double(eventsData.size()*ratioMcToData) << endmsg; + // InfoMsg << "double(eventsData.size())*double(ratioMcToData): " << double(eventsData.size())*double(ratioMcToData) << endmsg; + // InfoMsg << "maxMcEvts: " << maxMcEvts << endmsg; + theAppBase.readEvents(mcData, mcFileNames, 0, GlobalEnv::instance()->Channel()->useMCEvtWeight(), 0, maxMcEvts-1); }