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

…n files in make_db.sh
cms-sw · Nov 3, 2015 · 15b17e4 · 15b17e4
1 parent 0ad1fdc
commit 15b17e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/RecoHI/HiJetAlgos/plugins/UETableProducer.cc b/RecoHI/HiJetAlgos/plugins/UETableProducer.cc
@@ -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 {

diff --git a/RecoHI/HiJetAlgos/test/make_db.sh b/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