Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fix for compatible mode in UETableProducer. Don't overwrite pytho… #12227

Merged
merged 1 commit into from Nov 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions RecoHI/HiJetAlgos/plugins/UETableProducer.cc
Expand Up @@ -204,10 +204,10 @@ UETableProducer::endJob() {

jme_payload->push_back(JetCorrectorParametersCollection::L1Offset, parameter);

if( pool->isNewTagRequest( "HeavyIonUERcd" ) ){
pool->createNewIOV<JetCorrectorParametersCollection>( jme_payload, pool->beginOfTime(), pool->endOfTime(), "HeavyIonUERcd" );
if( pool->isNewTagRequest( "JetCorrectionsRecord" ) ){
pool->createNewIOV<JetCorrectorParametersCollection>( jme_payload, pool->beginOfTime(), pool->endOfTime(), "JetCorrectionsRecord" );
}else{
pool->appendSinceTime<JetCorrectorParametersCollection>( jme_payload, pool->currentTime(), "HeavyIonUERcd" );
pool->appendSinceTime<JetCorrectorParametersCollection>( jme_payload, pool->currentTime(), "JetCorrectionsRecord" );
}
}
else {
Expand Down
6 changes: 4 additions & 2 deletions RecoHI/HiJetAlgos/test/make_db.sh
@@ -1,15 +1,17 @@
#!/bin/sh

py=`mktemp --tmpdir=. make_db_XXXXXXXXXX.py`
#py=`mktemp --tmpdir=. make_db_XXXXXXXXXX.py`

trap "rm -f \"$py\"" 1 2 3 15
#trap "rm -f \"$py\"" 1 2 3 15

o="./output.db"
v="00"

#eval `scramv1 runtime -sh`
rm -f "$o"
for f in ue_calibrations_pf_mc.txt ue_calibrations_calo_mc.txt ue_calibrations_pf_data.txt ue_calibrations_calo_data.txt; do
py=`mktemp --tmpdir=. make_db_XXXXXXXXXX.py`
trap "rm -f \"$py\"" 1 2 3 15
e="unknown"
d="unknown"
case "$f" in
Expand Down