Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Pawian
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PWA
Pawian
Commits
b9475d01
Commit
b9475d01
authored
11 years ago
by
Julian Pychy
Browse files
Options
Downloads
Patches
Plain Diff
fixed reading of ratioMcToData for coupled channels
parent
e69c98ee
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Examples/epem/epemReactionApp.cc
+4
-3
4 additions, 3 deletions
Examples/epem/epemReactionApp.cc
Examples/gammap/gammapReactionApp.cc
+4
-2
4 additions, 2 deletions
Examples/gammap/gammapReactionApp.cc
Examples/pbarp/pbarpReactionApp.cc
+5
-5
5 additions, 5 deletions
Examples/pbarp/pbarpReactionApp.cc
with
13 additions
and
10 deletions
Examples/epem/epemReactionApp.cc
+
4
−
3
View file @
b9475d01
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Examples/gammap/gammapReactionApp.cc
+
4
−
2
View file @
b9475d01
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Examples/pbarp/pbarpReactionApp.cc
+
5
−
5
View file @
b9475d01
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment