From 154af3cec3ad62e042d462708e895ea431088df1 Mon Sep 17 00:00:00 2001 From: amassiro Date: Fri, 2 Aug 2019 14:37:42 +0200 Subject: [PATCH 1/2] revert --- Setup.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Setup.sh b/Setup.sh index ac77aed..4d2814f 100755 --- a/Setup.sh +++ b/Setup.sh @@ -246,9 +246,7 @@ elif [[ "$CMSSW_VERSION" == CMSSW_8_*_* ]]; then fi # EGMRegression negative energy fix - # git cms-merge-topic rafaellopesdesa:RegressionCheckNegEnergy - # still useful given the other merge for egamma ? It is crashing ad compilation time if left uncommented - # + git cms-merge-topic rafaellopesdesa:RegressionCheckNegEnergy echo " - MET corrections" git cms-merge-topic cms-met:METRecipe_8020 -u @@ -287,10 +285,7 @@ elif [[ "$CMSSW_VERSION" == CMSSW_8_*_* ]]; then git clone git@github.com:yiiyama/multidraw.git LatinoAnalysis/MultiDraw cd LatinoAnalysis/MultiDraw - git checkout 2.0.5 2>/dev/null - # - # the version 2.0.7 is using newer c++ code, not ok for 8_X_Y cmssw releases - # + git checkout 2.0.7 2>/dev/null ./mkLinkDef.py --cmssw elif [[ "$CMSSW_VERSION" == CMSSW_9_*_* ]]; then From 29c2eb5dcded4bbd28091fbec5e0abdd39920f65 Mon Sep 17 00:00:00 2001 From: amassiro Date: Fri, 2 Aug 2019 14:44:09 +0200 Subject: [PATCH 2/2] update for 8_X_Y releases to make it compile --- Setup.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Setup.sh b/Setup.sh index 4d2814f..ac77aed 100755 --- a/Setup.sh +++ b/Setup.sh @@ -246,7 +246,9 @@ elif [[ "$CMSSW_VERSION" == CMSSW_8_*_* ]]; then fi # EGMRegression negative energy fix - git cms-merge-topic rafaellopesdesa:RegressionCheckNegEnergy + # git cms-merge-topic rafaellopesdesa:RegressionCheckNegEnergy + # still useful given the other merge for egamma ? It is crashing ad compilation time if left uncommented + # echo " - MET corrections" git cms-merge-topic cms-met:METRecipe_8020 -u @@ -285,7 +287,10 @@ elif [[ "$CMSSW_VERSION" == CMSSW_8_*_* ]]; then git clone git@github.com:yiiyama/multidraw.git LatinoAnalysis/MultiDraw cd LatinoAnalysis/MultiDraw - git checkout 2.0.7 2>/dev/null + git checkout 2.0.5 2>/dev/null + # + # the version 2.0.7 is using newer c++ code, not ok for 8_X_Y cmssw releases + # ./mkLinkDef.py --cmssw elif [[ "$CMSSW_VERSION" == CMSSW_9_*_* ]]; then