Skip to content
Snippets Groups Projects
Commit b9475d01 authored by Julian Pychy's avatar Julian Pychy
Browse files

fixed reading of ratioMcToData for coupled channels

parent e69c98ee
No related branches found
No related tags found
No related merge requests found
......@@ -214,8 +214,6 @@ int main(int __argc,char *__argv[]){
return 1;
}
// Get the mc data limit
int ratioMcToData=theAppParams->ratioMcToData();
if(mode == "server"){
......@@ -230,6 +228,7 @@ int main(int __argc,char *__argv[]){
Info << "mc file: " << mcFile ; // << endmsg;
int noOfDataEvents =(*it).first->parser()->noOfDataEvts();
int ratioMcToData=(*it).first->parser()->ratioMcToData();
std::vector<std::string> dataFileNames;
dataFileNames.push_back(datFile);
......@@ -278,6 +277,7 @@ int main(int __argc,char *__argv[]){
Info << "mc file: " << mcFile ; // << endmsg;
int noOfDataEvents =(*it).first->parser()->noOfDataEvts();
int ratioMcToData=(*it).first->parser()->ratioMcToData();
std::vector<std::string> dataFileNames;
dataFileNames.push_back(datFile);
......@@ -338,7 +338,8 @@ int main(int __argc,char *__argv[]){
Info << "mc file: " << mcFile ; // << endmsg;
int noOfDataEvents = theAppParams->noOfDataEvts();
int ratioMcToData = theAppParams->ratioMcToData();
std::vector<std::string> dataFileNames;
dataFileNames.push_back(datFile);
......
......@@ -204,8 +204,7 @@ int main(int __argc,char *__argv[]){
return 1;
}
// Get the mc data limit
int ratioMcToData=theAppParams->ratioMcToData();
if(mode == "server"){
......@@ -228,6 +227,7 @@ int main(int __argc,char *__argv[]){
theAppBase.readEvents(eventsData, dataFileNames, (*it).first->channelID(), (*it).first->useEvtWeight());
EventList mcData;
int ratioMcToData=(*it).first->parser()->ratioMcToData();
int maxMcEvts=eventsData.size()*ratioMcToData;
theAppBase.readEvents(mcData, mcFileNames, (*it).first->channelID(), (*it).first->useEvtWeight(), 0, maxMcEvts-1);
......@@ -273,6 +273,7 @@ int main(int __argc,char *__argv[]){
// theAppBase.readEvents(eventsData, dataFileNames, (*it).first->channelID(), (*it).first->useEvtWeight());
// EventList mcData;
// int ratioMcToData=(*it).first->parser()->ratioMcToData();
// int maxMcEvts=eventsData.size()*ratioMcToData;
// theAppBase.readEvents(mcData, mcFileNames, (*it).first->channelID(), false, 0, maxMcEvts-1);
......@@ -330,6 +331,7 @@ int main(int __argc,char *__argv[]){
theAppBase.readEvents(eventsData, dataFileNames, 0, GlobalEnv::instance()->Channel()->useEvtWeight());
// theAppBase.readEvents(eventsData, dataFileNames, 0, 100000);
int ratioMcToData=theAppParams->ratioMcToData();
int maxMcEvts=eventsData.size()*ratioMcToData;
EventList mcData;
......
......@@ -219,9 +219,6 @@ int main(int __argc,char *__argv[]){
// Get the mc data limit
int ratioMcToData=theAppParams->ratioMcToData();
if(mode == "server"){
......@@ -237,6 +234,7 @@ int main(int __argc,char *__argv[]){
Info << "mc file: " << mcFile ; // << endmsg;
int noOfDataEvents =(*it).first->parser()->noOfDataEvts();
int ratioMcToData=(*it).first->parser()->ratioMcToData();
std::vector<std::string> dataFileNames;
dataFileNames.push_back(datFile);
......@@ -285,7 +283,8 @@ int main(int __argc,char *__argv[]){
Info << "mc file: " << mcFile ; // << endmsg;
int noOfDataEvents =(*it).first->parser()->noOfDataEvts();
int ratioMcToData=(*it).first->parser()->ratioMcToData();
std::vector<std::string> dataFileNames;
dataFileNames.push_back(datFile);
......@@ -347,7 +346,8 @@ int main(int __argc,char *__argv[]){
Info << "mc file: " << mcFile ; // << endmsg;
int noOfDataEvents = theAppParams->noOfDataEvts();
int ratioMcToData= theAppParams->ratioMcToData();
std::vector<std::string> dataFileNames;
dataFileNames.push_back(datFile);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment