Skip to content

Commit

Permalink
Merge pull request cms-sw#112 from amarini/topic_merge
Browse files Browse the repository at this point in the history 
Topic merge
  • Loading branch information
@amarini
amarini authored Feb 21, 2017
2 parents 6ff8772 + ab36607 commit 8fecf80
Show file tree
Hide file tree
Showing 111 changed files with 16,618 additions and 1,012 deletions.
8 changes: 5 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ $(info CMSSW found: $(CMSSW_BASE) )
COMBINELIBFILE = $(wildcard $(CMSSW_BASE)/lib/$(SCRAM_ARCH)/libHiggsAnalysisCombinedLimit.so)
COMBINELIB = HiggsAnalysisCombinedLimit
COMBINELIBDIR = $(CMSSW_BASE)/lib/$(SCRAM_ARCH)/
CXXFLAGS += -D HAVE_PYTHIA -I/cvmfs/cms.cern.ch/$(SCRAM_ARCH)/external/pythia8/212/include -L/cvmfs/cms.cern.ch/$(SCRAM_ARCH)/external/pythia8/212/lib -lpythia8
CXXFLAGS += -D HAVE_PYTHIA -I/cvmfs/cms.cern.ch/$(SCRAM_ARCH)/external/pythia8/219/include -L/cvmfs/cms.cern.ch/$(SCRAM_ARCH)/external/pythia8/219/lib -lpythia8
#-I/cvmfs/cms.cern.ch/$(SCRAM_ARCH)/external/clhep/2.2.0.4-kpegke/include
#"-lpythia8 -lclhep "
endif
Expand Down Expand Up @@ -70,8 +70,10 @@ $(OBJ) : $(BINDIR)/%.o : $(SRCDIR)/%.cpp interface/%.hpp | $(BINDIR)
Dict: $(BINDIR)/dict.o

$(BINDIR)/dict.o: $(SRC) | $(BINDIR)
cd $(BINDIR) && rootcint -v4 -f dict.cc -c -I../../ -I../ $(HPPLINKDEF) ../interface/LinkDef.hpp
cd $(BINDIR) && $(GCC) -c -o dict.o $(CXXFLAGS) $(RPATH) -I../../ dict.cc
genreflex $(SRCDIR)/classes.h -s $(SRCDIR)/classes_def.xml -o $(BINDIR)/dict.cc --deep --fail_on_warnings --rootmap=$(BINDIR)/dict.rootmap --rootmap-lib=libChargedHiggs.so -I interface/
$(GCC) -c -o $(BINDIR)/dict.o $(CXXFLAGS) $(RPATH) -I interface $(BINDIR)/dict.cc
#cd $(BINDIR) && rootcint -v4 -f dict.cc -c -I../../ -I../ $(HPPLINKDEF) ../interface/LinkDef.hpp
#cd $(BINDIR) && $(GCC) -c -o dict.o $(CXXFLAGS) $(RPATH) -I../../ dict.cc

$(BINDIR):
mkdir -p $(BINDIR)
Expand Down
2 changes: 1 addition & 1 deletion Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ git checkout v6.3.0 ##01bb477 ## (31cc693) ## ( 74x-root6 )
scram b -j 16
```

## Submission to Batch
# Submission to Batch
* Submission to the batch system is performed with the script/submit.py:
```
$python script/submit.py --help
Expand Down
Binary file added aux/KaMuCa/DATA_76X_13TeV.root
View file
Binary file not shown.
Binary file added aux/KaMuCa/DATA_80X_13TeV.root
View file
Binary file not shown.
Binary file added aux/KaMuCa/MC_76X_13TeV.root
View file
Binary file not shown.
Binary file added aux/KaMuCa/MC_80X_13TeV.root
View file
Binary file not shown.
64 changes: 64 additions & 0 deletions aux/RMet110_Prescale_v5.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# QCD R-factor computed by PurityFit
##tauinviso pteta 50 55 -2.1 2.1 -nan -nan
##tauinviso pteta 55 60 -2.1 2.1 -nan -nan
##tauinviso pteta 60 65 -2.1 2.1 0.362494 0
##tauinviso pteta 65 70 -2.1 2.1 0.352596 0
##tauinviso pteta 70 80 -2.1 2.1 0.349037 0
##tauinviso pteta 80 90 -2.1 2.1 0.353777 0
##tauinviso pteta 90 100 -2.1 2.1 0.361289 0
##tauinviso pteta 100 125 -2.1 2.1 0.335728 0
##tauinviso pteta 125 150 -2.1 2.1 0.293721 0
##tauinviso pteta 150 175 -2.1 2.1 0.276728 0
##tauinviso pteta 175 200 -2.1 2.1 0.276782 0
##tauinviso pteta 200 250 -2.1 2.1 0.258725 0
##tauinviso pteta 250 500 -2.1 2.1 0.257033 0
##tauinviso pteta 500 750 -2.1 2.1 0.279201 0
##tauinviso pteta 750 1000 -2.1 2.1 0.330547 0
##tauinviso pteta 1000 8000 -2.1 2.1 0.999728 0

tauinvisospline spline 62.433 0.362494 0
tauinvisospline spline 67.4184 0.352596 0
tauinvisospline spline 74.663 0.349037 0
tauinvisospline spline 84.6885 0.353777 0
tauinvisospline spline 94.7172 0.361289 0
tauinvisospline spline 111.108 0.335728 0
tauinvisospline spline 136.194 0.293721 0
tauinvisospline spline 161.457 0.276728 0
tauinvisospline spline 186.253 0.276782 0
tauinvisospline spline 221.182 0.258725 0
tauinvisospline spline 306.722 0.257033 0
tauinvisospline spline 566.642 0.279201 0
tauinvisospline spline 811.343 0.330547 0
tauinvisospline spline 8000.00 0.330547 0

# QCD R-factor computed by PurityFit
#tauinviso_1p pteta 1000 8000 -2.1 2.1 0.999728 0
#tauinviso_1p pteta 100 125 -2.1 2.1 0.335728 0
#tauinviso_1p pteta 125 150 -2.1 2.1 0.293721 0
#tauinviso_1p pteta 150 175 -2.1 2.1 0.276728 0
#tauinviso_1p pteta 175 200 -2.1 2.1 0.276782 0
#tauinviso_1p pteta 200 250 -2.1 2.1 0.258725 0
#tauinviso_1p pteta 250 500 -2.1 2.1 0.257033 0
#tauinviso_1p pteta 500 750 -2.1 2.1 0.279201 0
#tauinviso_1p pteta 50 55 -2.1 2.1 -nan -nan
#tauinviso_1p pteta 55 60 -2.1 2.1 -nan -nan
#tauinviso_1p pteta 60 65 -2.1 2.1 0.362494 0
#tauinviso_1p pteta 65 70 -2.1 2.1 0.352596 0
#tauinviso_1p pteta 70 80 -2.1 2.1 0.349037 0
#tauinviso_1p pteta 750 1000 -2.1 2.1 0.330547 0
#tauinviso_1p pteta 80 90 -2.1 2.1 0.353777 0
#tauinviso_1p pteta 90 100 -2.1 2.1 0.361289 0
tauinvisospline_1p spline 62.433 0.362494 0
tauinvisospline_1p spline 67.4184 0.352596 0
tauinvisospline_1p spline 74.663 0.349037 0
tauinvisospline_1p spline 84.6885 0.353777 0
tauinvisospline_1p spline 94.7172 0.361289 0
tauinvisospline_1p spline 111.108 0.335728 0
tauinvisospline_1p spline 136.194 0.293721 0
tauinvisospline_1p spline 161.457 0.276728 0
tauinvisospline_1p spline 186.253 0.276782 0
tauinvisospline_1p spline 221.182 0.258725 0
tauinvisospline_1p spline 306.722 0.257033 0
tauinvisospline_1p spline 566.642 0.279201 0
tauinvisospline_1p spline 811.343 0.330547 0
tauinvisospline_1p spline 8000.00 0.330547 0
96 changes: 96 additions & 0 deletions aux/ScalesSmearings/74X_Prompt_2015_scales.dat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
absEta_0_1-highR9-Et_0_20 runNumber 1 2 1.0000 0.0000 0.0001 0.0015
absEta_0_1-highR9-Et_0_20 runNumber 254790 260627 1.0003 0.0001 0.0001 0.0015
absEta_0_1-highR9-Et_0_20 runNumber 3 254789 1.0003 0.0001 0.0001 0.0015
absEta_0_1-highR9-Et_100_1000000 runNumber 1 2 1.0000 0.0000 0.0001 0.0013
absEta_0_1-highR9-Et_100_1000000 runNumber 254790 260627 1.0003 0.0001 0.0001 0.0013
absEta_0_1-highR9-Et_100_1000000 runNumber 3 254789 1.0003 0.0001 0.0001 0.0013
absEta_0_1-highR9-Et_20_35 runNumber 1 2 1.0000 0.0000 0.0001 0.0015
absEta_0_1-highR9-Et_20_35 runNumber 254790 260627 1.0003 0.0001 0.0001 0.0015
absEta_0_1-highR9-Et_20_35 runNumber 3 254789 1.0003 0.0001 0.0001 0.0015
absEta_0_1-highR9-Et_35_43 runNumber 1 2 1.0000 0.0000 0.0001 0.0008
absEta_0_1-highR9-Et_35_43 runNumber 254790 260627 1.0003 0.0001 0.0001 0.0008
absEta_0_1-highR9-Et_35_43 runNumber 3 254789 1.0003 0.0001 0.0001 0.0008
absEta_0_1-highR9-Et_43_50 runNumber 1 2 1.0000 0.0000 0.0001 0.0004
absEta_0_1-highR9-Et_43_50 runNumber 254790 260627 1.0003 0.0001 0.0001 0.0004
absEta_0_1-highR9-Et_43_50 runNumber 3 254789 1.0003 0.0001 0.0001 0.0004
absEta_0_1-highR9-Et_50_55 runNumber 1 2 1.0000 0.0000 0.0001 0.0010
absEta_0_1-highR9-Et_50_55 runNumber 254790 260627 1.0003 0.0001 0.0001 0.0010
absEta_0_1-highR9-Et_50_55 runNumber 3 254789 1.0003 0.0001 0.0001 0.0010
absEta_0_1-highR9-Et_55_100 runNumber 1 2 1.0000 0.0000 0.0001 0.0013
absEta_0_1-highR9-Et_55_100 runNumber 254790 260627 1.0003 0.0001 0.0001 0.0013
absEta_0_1-highR9-Et_55_100 runNumber 3 254789 1.0003 0.0001 0.0001 0.0013
absEta_0_1-lowR9-Et_0_20 runNumber 1 2 1.0000 0.0000 0.0001 0.0013
absEta_0_1-lowR9-Et_0_20 runNumber 254790 260627 1.0039 0.0001 0.0001 0.0013
absEta_0_1-lowR9-Et_0_20 runNumber 3 254789 1.0039 0.0001 0.0001 0.0013
absEta_0_1-lowR9-Et_100_1000000 runNumber 1 2 1.0000 0.0000 0.0001 0.0020
absEta_0_1-lowR9-Et_100_1000000 runNumber 254790 260627 1.0039 0.0001 0.0001 0.0020
absEta_0_1-lowR9-Et_100_1000000 runNumber 3 254789 1.0039 0.0001 0.0001 0.0020
absEta_0_1-lowR9-Et_20_33 runNumber 1 2 1.0000 0.0000 0.0001 0.0013
absEta_0_1-lowR9-Et_20_33 runNumber 254790 260627 1.0039 0.0001 0.0001 0.0013
absEta_0_1-lowR9-Et_20_33 runNumber 3 254789 1.0039 0.0001 0.0001 0.0013
absEta_0_1-lowR9-Et_33_39 runNumber 1 2 1.0000 0.0000 0.0001 0.0007
absEta_0_1-lowR9-Et_33_39 runNumber 254790 260627 1.0039 0.0001 0.0001 0.0007
absEta_0_1-lowR9-Et_33_39 runNumber 3 254789 1.0039 0.0001 0.0001 0.0007
absEta_0_1-lowR9-Et_39_45 runNumber 1 2 1.0000 0.0000 0.0001 0.0005
absEta_0_1-lowR9-Et_39_45 runNumber 254790 260627 1.0039 0.0001 0.0001 0.0005
absEta_0_1-lowR9-Et_39_45 runNumber 3 254789 1.0039 0.0001 0.0001 0.0005
absEta_0_1-lowR9-Et_45_50 runNumber 1 2 1.0000 0.0000 0.0001 0.0010
absEta_0_1-lowR9-Et_45_50 runNumber 254790 260627 1.0039 0.0001 0.0001 0.0010
absEta_0_1-lowR9-Et_45_50 runNumber 3 254789 1.0039 0.0001 0.0001 0.0010
absEta_0_1-lowR9-Et_50_58 runNumber 1 2 1.0000 0.0000 0.0001 0.0014
absEta_0_1-lowR9-Et_50_58 runNumber 254790 260627 1.0039 0.0001 0.0001 0.0014
absEta_0_1-lowR9-Et_50_58 runNumber 3 254789 1.0039 0.0001 0.0001 0.0014
absEta_0_1-lowR9-Et_58_100 runNumber 1 2 1.0000 0.0000 0.0001 0.0020
absEta_0_1-lowR9-Et_58_100 runNumber 254790 260627 1.0039 0.0001 0.0001 0.0020
absEta_0_1-lowR9-Et_58_100 runNumber 3 254789 1.0039 0.0001 0.0001 0.0020
absEta_1_1.4442-highR9-Et_0_20 runNumber 1 2 1.0000 0.0000 0.0004 0.0006
absEta_1_1.4442-highR9-Et_0_20 runNumber 254790 260627 0.9925 0.0003 0.0004 0.0006
absEta_1_1.4442-highR9-Et_0_20 runNumber 3 254789 0.9925 0.0003 0.0004 0.0006
absEta_1_1.4442-highR9-Et_100_1000000 runNumber 1 2 1.0000 0.0000 0.0004 0.0009
absEta_1_1.4442-highR9-Et_100_1000000 runNumber 254790 260627 0.9925 0.0003 0.0004 0.0009
absEta_1_1.4442-highR9-Et_100_1000000 runNumber 3 254789 0.9925 0.0003 0.0004 0.0009
absEta_1_1.4442-highR9-Et_20_40 runNumber 1 2 1.0000 0.0000 0.0004 0.0006
absEta_1_1.4442-highR9-Et_20_40 runNumber 254790 260627 0.9925 0.0003 0.0004 0.0006
absEta_1_1.4442-highR9-Et_20_40 runNumber 3 254789 0.9925 0.0003 0.0004 0.0006
absEta_1_1.4442-highR9-Et_40_50 runNumber 1 2 1.0000 0.0000 0.0004 0.0009
absEta_1_1.4442-highR9-Et_40_50 runNumber 254790 260627 0.9925 0.0003 0.0004 0.0009
absEta_1_1.4442-highR9-Et_40_50 runNumber 3 254789 0.9925 0.0003 0.0004 0.0009
absEta_1_1.4442-highR9-Et_50_100 runNumber 1 2 1.0000 0.0000 0.0004 0.0009
absEta_1_1.4442-highR9-Et_50_100 runNumber 254790 260627 0.9925 0.0003 0.0004 0.0009
absEta_1_1.4442-highR9-Et_50_100 runNumber 3 254789 0.9925 0.0003 0.0004 0.0009
absEta_1_1.4442-lowR9-Et_0_20 runNumber 1 2 1.0000 0.0000 0.0001 0.0029
absEta_1_1.4442-lowR9-Et_0_20 runNumber 254790 260627 1.0023 0.0001 0.0001 0.0029
absEta_1_1.4442-lowR9-Et_0_20 runNumber 3 254789 1.0023 0.0001 0.0001 0.0029
absEta_1_1.4442-lowR9-Et_100_1000000 runNumber 1 2 1.0000 0.0000 0.0001 0.0059
absEta_1_1.4442-lowR9-Et_100_1000000 runNumber 254790 260627 1.0023 0.0001 0.0001 0.0059
absEta_1_1.4442-lowR9-Et_100_1000000 runNumber 3 254789 1.0023 0.0001 0.0001 0.0059
absEta_1_1.4442-lowR9-Et_20_33 runNumber 1 2 1.0000 0.0000 0.0001 0.0029
absEta_1_1.4442-lowR9-Et_20_33 runNumber 254790 260627 1.0023 0.0001 0.0001 0.0029
absEta_1_1.4442-lowR9-Et_20_33 runNumber 3 254789 1.0023 0.0001 0.0001 0.0029
absEta_1_1.4442-lowR9-Et_33_39 runNumber 1 2 1.0000 0.0000 0.0001 0.0014
absEta_1_1.4442-lowR9-Et_33_39 runNumber 254790 260627 1.0023 0.0001 0.0001 0.0014
absEta_1_1.4442-lowR9-Et_33_39 runNumber 3 254789 1.0023 0.0001 0.0001 0.0014
absEta_1_1.4442-lowR9-Et_39_45 runNumber 1 2 1.0000 0.0000 0.0001 0.0009
absEta_1_1.4442-lowR9-Et_39_45 runNumber 254790 260627 1.0023 0.0001 0.0001 0.0009
absEta_1_1.4442-lowR9-Et_39_45 runNumber 3 254789 1.0023 0.0001 0.0001 0.0009
absEta_1_1.4442-lowR9-Et_45_50 runNumber 1 2 1.0000 0.0000 0.0001 0.0034
absEta_1_1.4442-lowR9-Et_45_50 runNumber 254790 260627 1.0023 0.0001 0.0001 0.0034
absEta_1_1.4442-lowR9-Et_45_50 runNumber 3 254789 1.0023 0.0001 0.0001 0.0034
absEta_1_1.4442-lowR9-Et_50_58 runNumber 1 2 1.0000 0.0000 0.0001 0.0050
absEta_1_1.4442-lowR9-Et_50_58 runNumber 254790 260627 1.0023 0.0001 0.0001 0.0050
absEta_1_1.4442-lowR9-Et_50_58 runNumber 3 254789 1.0023 0.0001 0.0001 0.0050
absEta_1_1.4442-lowR9-Et_58_100 runNumber 1 2 1.0000 0.0000 0.0001 0.0059
absEta_1_1.4442-lowR9-Et_58_100 runNumber 254790 260627 1.0023 0.0001 0.0001 0.0059
absEta_1_1.4442-lowR9-Et_58_100 runNumber 3 254789 1.0023 0.0001 0.0001 0.0059
absEta_1.566_2-highR9 runNumber 1 2 1.0000 0.0000 0.0004 0.0009
absEta_1.566_2-highR9 runNumber 254790 260627 1.0034 0.0002 0.0004 0.0009
absEta_1.566_2-highR9 runNumber 3 254789 1.0034 0.0002 0.0004 0.0009
absEta_1.566_2-lowR9 runNumber 1 2 1.0000 0.0000 0.0002 0.0007
absEta_1.566_2-lowR9 runNumber 254790 260627 1.0124 0.0002 0.0002 0.0007
absEta_1.566_2-lowR9 runNumber 3 254789 1.0124 0.0002 0.0002 0.0007
absEta_2_2.5-lowR9 runNumber 1 2 1.0000 0.0000 0.0002 0.0005
absEta_2_2.5-lowR9 runNumber 254790 260627 1.0204 0.0003 0.0002 0.0005
absEta_2_2.5-lowR9 runNumber 3 254789 1.0204 0.0003 0.0002 0.0005
absEta_2_2.5-highR9 runNumber 1 2 1.0000 0.0000 0.0003 0.0013
absEta_2_2.5-highR9 runNumber 254790 260627 1.0145 0.0002 0.0003 0.0013
absEta_2_2.5-highR9 runNumber 3 254789 1.0145 0.0002 0.0003 0.0013
9 changes: 9 additions & 0 deletions aux/ScalesSmearings/74X_Prompt_2015_smearings.dat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#category Emean err_Emean rho err_rho phi err_phi
absEta_0_1-highR9 0 0 0.0141 0.0001 M_PI_2 M_PI_2
absEta_0_1-lowR9 0 0 0.0144 0.0002 M_PI_2 M_PI_2
absEta_1_1.4442-highR9 0 0 0.0168 0.0011 M_PI_2 M_PI_2
absEta_1_1.4442-lowR9 0 0 0.0212 0.0003 M_PI_2 M_PI_2
absEta_1.566_2-highR9 0 0 0.0276 0.0008 M_PI_2 M_PI_2
absEta_1.566_2-lowR9 0 0 0.0290 0.0004 M_PI_2 M_PI_2
absEta_2_2.5-highR9 0 0 0.0314 0.0005 M_PI_2 M_PI_2
absEta_2_2.5-lowR9 0 0 0.0324 0.0006 M_PI_2 M_PI_2
Loading

0 comments on commit 8fecf80

Please sign in to comment.