Skip to content

Etscales rebased #119

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.

Sign up for GitHub

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

Open
previsualconsent wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Etscales rebased #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7276567
added option for smearing mass range in ZFitter
previsualconsent Apr 26, 2017
723ed25
smearer branch uses energyBranchName, categories disabled by mc stats
previsualconsent May 31, 2017
db66db8
loads of plotting changes
previsualconsent May 31, 2017
5e2bf2c
energyScale.sh split EB and EE Steps
previsualconsent May 31, 2017
c86467d
changed functions.sh
previsualconsent May 31, 2017
ed1f7ce
fix which set of scales to multiply new scales to
previsualconsent Jun 1, 2017
4157a52
multiply scales derived in this step by scales used to make scaleEle …
previsualconsent Jun 2, 2017
edf8dff
fix scales in plot.py
previsualconsent Jun 7, 2017
b69961a
added nEntries to standardDataMC.py, update Summary
previsualconsent Jun 26, 2017
fa6d420
updated olgRegr LTBinned dat
previsualconsent Jun 26, 2017
bd716de
changes for jet met check
previsualconsent Jun 2, 2017
73b8da2
fixed gain parsing
Jun 12, 2017
2da66d9
jetmet regions files and nogain scales.dat
previsualconsent Jun 12, 2017
e6f2d9b
disable categories with less than 10 events in data
Jun 18, 2017
811aeed
now also custom selection for plots and highEta selection implemnted
Jun 18, 2017
170da02
temporary changes for jetmet checks
Jun 18, 2017
e170b74
ZFitter and classes updates
previsualconsent Mar 13, 2017
279c439
new LSF submission tool
Apr 10, 2017
8b7831f
removed CRAB2 init file
Apr 17, 2017
d9f643f
updated scripts
Jun 8, 2017
692b128
fixed prodNtuples for submit tool
Jun 8, 2017
5da1834
modifying the job name
Jun 12, 2017
1e6112a
temporary fix of _isMINIAOD
Jun 19, 2017
724b7d8
update EcalAlCaRecoProducers datasets
Jun 19, 2017
f6afc43
ratio range in standardDataMC.py
previsualconsent Jun 19, 2017
380beab
dat file for newRegr(fixed)
Jun 20, 2017
eb227bb
fixed typos in name of Gain1asGain12 scales branch
previsualconsent Jun 21, 2017
cb76abe
undo jetmet-check in energyScales.sh
previsualconsent Jul 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "ZFitter/data/ScalesSmearings"]
path = ZFitter/data/ScalesSmearings
url = [email protected]:ECALELFS/ScalesSmearings
4 changes: 2 additions & 2 deletions EcalAlCaRecoProducers/alcareco_datasets.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,8 @@ allRange /DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16DR
allRange /DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v2/MINIAODSIM DYJets_madgraph-RunIISummer16-miniAODv2 caf database VALID MORIOND2017 -

##### RunII Summer 16 --- PU Moriond 17 --- Madgraph-herwigpp
allRange /DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-herwigpp_30M/RunIISummer16DR80Premix-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/AODSIM DYJets_herwigpp-RunIISummer16 caf group/dpg_ecal/alca_ecalcalib/ecalelf/alcareco VALID MORIOND2017 -
allRange /DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-herwigpp_30M/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM DYJets_herwigpp-RunIISummer16-miniAODv2 caf database VALID MORIOND2017 -
allRange /DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-herwigpp_30M/RunIISummer16DR80Premix-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/AODSIM DYJets_herwigpp-RunIISummer16 caf group/dpg_ecal/alca_ecalcalib/ecalelf/alcareco INVALID MORIOND2017 -
allRange /DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-herwigpp_30M/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM DYJets_herwigpp-RunIISummer16-miniAODv2 caf database INVALID MORIOND2017 -

####################For Higgs studies#########################################################
allRange /ZToEE_NNPDF30_13TeV-powheg_M_50_120/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM ZToEE_NNPDF30-powheg-RunIISummer16-miniAODv2 caf database VALID MORIOND2017 -
Expand Down
43 changes: 0 additions & 43 deletions EcalAlCaRecoProducers/alcarereco_datasets.dat
View file
Open in desktop

This file was deleted.

46 changes: 25 additions & 21 deletions EcalAlCaRecoProducers/awk/compact.awk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,42 @@ first=-1
last=-1
}

(NF!=0 && first==-1){
first=$1;
last=$1-1;
(NF==1){
print $0
intervals=""
}

(NF!=0 && first!=-1 && last!=-1){

if ($1 == last+1){
last=$1
}else{
(NF>1 ){
status=$1
first=$2
last=first-1
intervals=""
for(i=2; i <=NF; i++){

if ($i == last+1){
last=$i
}else{
if (first==last){
intervals=sprintf("%s%d,",intervals,first)
# print $1,intervals
}else{
intervals=sprintf("%s%d-%d,",intervals,first,last)
}
first=$i
last=$i

}
}
if (first==last){
intervals=sprintf("%s%d,",intervals,first)
# print $1,intervals
}else{
intervals=sprintf("%s%d-%d,",intervals,first,last)
}
first=$1
last=$1

}

printf("[%s] %s\n", status, intervals)

}


END{
if (first==last){
intervals=sprintf("%s%d,",intervals,first)
}else{
intervals=sprintf("%s%d-%d,",intervals,first,last)
}

print intervals

}
12 changes: 6 additions & 6 deletions EcalAlCaRecoProducers/launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ CHECK=--check

#where=remoteGlidein
scheduler=caf
tag_MC=config/reRecoTags/80X_mcRun2_asymptotic_2016_TrancheIV_v7.py
tag_MC=config/reRecoTags/80X_mcRun2_asymptotic_2016_TrancheIV_v8.py
tag_Prompt=config/reRecoTags/80X_dataRun2_Prompt_v16.py
tag_Rereco=config/reRecoTags/80X_dataRun2_2016SeptRepro_v7.py

fileList=alcareco_datasets.dat
#PERIOD=MORIOND17
PERIOD=MORIOND17
PERIOD=MORIOND2017

IFS=$'\n'
Expand All @@ -28,23 +28,23 @@ datasetsMC=(`./scripts/parseDatasetFile.sh $fileList | grep VALID | sed 's|$|,|'



for dataset in ${datasetsMC[@]} #${datasetsData[@]} #
for dataset in ${datasetsMC[@]} ${datasetsData[@]} #
do
datasetName=`echo $dataset | awk '{print $6}'`
echo $datasetName
# continue
case $datasetName in
*miniAODv2)
# echo $datasetName
./scripts/prodNtuples.sh --isMC --type=MINIAOD -t ${tag_MC} -s noSkim --scheduler=${scheduler} --extraName=regressionOld ${CHECK} $dataset
./scripts/prodNtuples.sh --isMC --type=MINIAOD -t ${tag_MC} -s noSkim --scheduler=${scheduler} ${CHECK} $dataset
;;
*Run2016H*MINIAOD)
#extraName=regressionMoriond17v2
./scripts/prodNtuples.sh --type=MINIAOD -t ${tag_Prompt} -s noSkim --scheduler=${scheduler} --extraName=regressionOld --json=$json --json_name=$jsonName ${CHECK} $dataset
./scripts/prodNtuples.sh --type=MINIAOD -t ${tag_Prompt} -s noSkim --scheduler=${scheduler} --extraName=newRegrFix --json=$json --json_name=$jsonName ${CHECK} $dataset
;;
*Run2016*MINIAOD)
#extraName=regressionMoriond17v2
./scripts/prodNtuples.sh --type=MINIAOD -t ${tag_Rereco} -s noSkim --scheduler=${scheduler} --extraName=regressionOld --json=$json --json_name=$jsonName ${CHECK} $dataset
./scripts/prodNtuples.sh --type=MINIAOD -t ${tag_Rereco} -s noSkim --scheduler=${scheduler} --extraName=newRegrFix --json=$json --json_name=$jsonName ${CHECK} $dataset

esac
done
Expand Down
6 changes: 3 additions & 3 deletions EcalAlCaRecoProducers/launchRereco.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jsonName=271036_284044-23Sep2016
PERIOD=LEGACY2016
#
#tags=( config/reRecoTags/Cal_Mar2017_ICcomb_v5.py)
tags=( config/reRecoTags/Cal_Mar2017_Legacy_noADCtoGeV.py)
tags=( config/reRecoTags/Cal_Mar2017_Legacy.py)
for tagfile in ${tags[@]}
do
echo
# ./scripts/removeRereco.sh -t $tagfile -f alcarereco_datasets.dat
# ./scripts/removeRereco.sh -t $tagfile -f ntuple_datasets.dat --json_name=$jsonName
# continue

for CHECK in '' --check
for CHECK in --check
do
case $tagfile in
*/Cal_*_ref*.py)
Expand All @@ -40,7 +40,7 @@ do
esac
done

for CHECK in '' --check
for CHECK in --check
do
case $tagfile in
*/Cal_*_ref*.py)
Expand Down
Loading