Fork me on GitHub

Changeset bd0a1aa in git


Ignore:
Timestamp:
Jun 13, 2016, 1:42:30 PM (9 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
29d662e
Parents:
4a0d9d5 (diff), 83e60eb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into dev_01

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r4a0d9d5 rbd0a1aa  
    271271        modules/Pythia8LinkDef.h \
    272272        modules/PileUpMergerPythia8.h
     273tmp/modules/Pythia8Dict$(PcmSuf): \
     274        tmp/modules/Pythia8Dict.$(SrcSuf)
    273275Pythia8Dict$(PcmSuf): \
    274         tmp/modules/Pythia8Dict$(PcmSuf) \
    275         tmp/modules/Pythia8Dict.$(SrcSuf)
     276        tmp/modules/Pythia8Dict$(PcmSuf)
    276277DELPHES_DICT_OBJ +=  \
    277278        tmp/modules/Pythia8Dict.$(ObjSuf)
    … …  
    288289        classes/SortableObject.h \
    289290        classes/DelphesClasses.h
     291tmp/classes/ClassesDict$(PcmSuf): \
     292        tmp/classes/ClassesDict.$(SrcSuf)
    290293ClassesDict$(PcmSuf): \
    291         tmp/classes/ClassesDict$(PcmSuf) \
    292         tmp/classes/ClassesDict.$(SrcSuf)
     294        tmp/classes/ClassesDict$(PcmSuf)
    293295tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
    294296        external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
    … …  
    303305        external/ExRootAnalysis/ExRootConfReader.h \
    304306        external/ExRootAnalysis/ExRootTask.h
     307tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf): \
     308        tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
    305309ExRootAnalysisDict$(PcmSuf): \
    306         tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf) \
    307         tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
     310        tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf)
    308311tmp/modules/ModulesDict.$(SrcSuf): \
    309312        modules/ModulesLinkDef.h \
    … …  
    348351        modules/VertexFinder.h \
    349352        modules/ExampleModule.h
     353tmp/modules/ModulesDict$(PcmSuf): \
     354        tmp/modules/ModulesDict.$(SrcSuf)
    350355ModulesDict$(PcmSuf): \
    351         tmp/modules/ModulesDict$(PcmSuf) \
    352         tmp/modules/ModulesDict.$(SrcSuf)
     356        tmp/modules/ModulesDict$(PcmSuf)
    353357DELPHES_DICT_OBJ +=  \
    354358        tmp/classes/ClassesDict.$(ObjSuf) \
    … …  
    366370        modules/FastJetGridMedianEstimator.h \
    367371        modules/RunPUPPI.h
     372tmp/modules/FastJetDict$(PcmSuf): \
     373        tmp/modules/FastJetDict.$(SrcSuf)
    368374FastJetDict$(PcmSuf): \
    369         tmp/modules/FastJetDict$(PcmSuf) \
    370         tmp/modules/FastJetDict.$(SrcSuf)
     375        tmp/modules/FastJetDict$(PcmSuf)
    371376FASTJET_DICT_OBJ +=  \
    372377        tmp/modules/FastJetDict.$(ObjSuf)
    … …  
    384389        display/DelphesHtmlSummary.h \
    385390        display/DelphesPlotSummary.h
     391tmp/display/DisplayDict$(PcmSuf): \
     392        tmp/display/DisplayDict.$(SrcSuf)
    386393DisplayDict$(PcmSuf): \
    387         tmp/display/DisplayDict$(PcmSuf) \
    388         tmp/display/DisplayDict.$(SrcSuf)
     394        tmp/display/DisplayDict$(PcmSuf)
    389395DISPLAY_DICT_OBJ +=  \
    390396        tmp/display/DisplayDict.$(ObjSuf)
    … …  
    21662172        @rm $@.arch $@.base
    21672173
    2168 %Dict$(PcmSuf):
     2174$(DELPHES_DICT_PCM): %Dict$(PcmSuf):
     2175        @echo ">> Copying $@"
     2176        @cp $< $@
     2177
     2178$(FASTJET_DICT_PCM): %Dict$(PcmSuf):
     2179        @echo ">> Copying $@"
     2180        @cp $< $@
     2181
     2182$(DISPLAY_DICT_PCM): %Dict$(PcmSuf):
    21692183        @echo ">> Copying $@"
    21702184        @cp $< $@

  • cards/CMS_PhaseII/CMS_PhaseII_0PU.tcl

    r4a0d9d5 rbd0a1aa  
    184184  set ResolutionFormula { 
    185185 
    186                         (abs(eta) <= 1.5)  * (1+0.64*abs(eta)^2)*(energy*0.028) +
     186                        (abs(eta) <= 1.5)  * (energy*0.028) +
    187187    (abs(eta) > 1.5  && abs(eta) <= 1.75)  * (energy*0.037) +
    188188    (abs(eta) > 1.75  && abs(eta) <= 2.15) * (energy*0.038) +
    … …  
    313313  # for the endcaps (1.5 < |eta| < 3.0), we take HGCAL  see LHCC-P-008, Fig. 3.39, p.117
    314314
    315   set ResolutionFormula {  (abs(eta) <= 1.50)                    * (1+0.64*abs(eta)^2)*sqrt(energy^2*0.009^2 + energy*0.12^2 + 0.45^2) +
     315  set ResolutionFormula {  (abs(eta) <= 1.50)                    * sqrt(energy^2*0.009^2 + energy*0.12^2 + 0.45^2) +
    316316                           (abs(eta) > 1.50 && abs(eta) <= 1.75) * sqrt(energy^2*0.006^2 + energy*0.20^2) + \
    317317                           (abs(eta) > 1.75 && abs(eta) <= 2.15) * sqrt(energy^2*0.007^2 + energy*0.21^2) + \

  • cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl

    r4a0d9d5 rbd0a1aa  
    1 set MaxEvents 10
    2 
    31#
    42#  Phase II - Pile-Up
    … …  
    234232  set ResolutionFormula {
    235233
    236                         (abs(eta) <= 1.5)  * (1+0.64*abs(eta)^2)*(energy*0.028) +
     234                        (abs(eta) <= 1.5)  * (energy*0.028) +
    237235    (abs(eta) > 1.5  && abs(eta) <= 1.75)  * (energy*0.037) +
    238236    (abs(eta) > 1.75  && abs(eta) <= 2.15) * (energy*0.038) +
    … …  
    365363  # for the endcaps (1.5 < |eta| < 3.0), we take HGCAL  see LHCC-P-008, Fig. 3.39, p.117
    366364
    367   set ResolutionFormula {  (abs(eta) <= 1.50)                    * (1+0.64*abs(eta)^2)*sqrt(energy^2*0.009^2 + energy*0.12^2 + 0.45^2) +
     365  set ResolutionFormula {  (abs(eta) <= 1.50)                    * sqrt(energy^2*0.009^2 + energy*0.12^2 + 0.45^2) +
    368366                           (abs(eta) > 1.50 && abs(eta) <= 1.75) * sqrt(energy^2*0.006^2 + energy*0.20^2) + \
    369367                           (abs(eta) > 1.75 && abs(eta) <= 2.15) * sqrt(energy^2*0.007^2 + energy*0.21^2) + \

  • cards/delphes_card_ATLAS_PileUp.tcl

    r4a0d9d5 rbd0a1aa  
    7373  set MeanPileUp 50
    7474
    75   # maximum spread in the beam direction in m
    76   set ZVertexSpread 0.10
     75   # maximum spread in the beam direction in m
     76  set ZVertexSpread 0.25
    7777
    7878  # maximum spread in time in s
    79   set TVertexSpread 1.5E-09
     79  set TVertexSpread 800E-12
    8080
    8181  # vertex smearing formula f(z,t) (z,t need to be respectively given in m,s)
    82 
    83   set VertexDistributionFormula {exp(-(t^2/(2*(0.05/2.99792458E8*exp(-(z^2/(2*(0.05)^2))))^2)))}
    84 
    85   #set VertexDistributionFormula { (abs(t) <= 1.0e-09) * (abs(z) <= 0.15) * (1.00) +
    86   #                                (abs(t) >  1.0e-09) * (abs(z) <= 0.15) * (0.00) +
    87   #                               (abs(t) <= 1.0e-09) * (abs(z) > 0.15)  * (0.00) +
    88   #                               (abs(t) >  1.0e-09) * (abs(z) > 0.15)  * (0.00)}
     82  set VertexDistributionFormula {exp(-(t^2/160e-12^2/2))*exp(-(z^2/0.053^2/2))}
    8983
    9084

  • cards/delphes_card_CMS_PileUp.tcl

    r4a0d9d5 rbd0a1aa  
    7474  set MeanPileUp 50
    7575
    76   # maximum spread in the beam direction in m
    77   set ZVertexSpread 0.10
     76   # maximum spread in the beam direction in m
     77  set ZVertexSpread 0.25
    7878
    7979  # maximum spread in time in s
    80   set TVertexSpread 1.5E-09
     80  set TVertexSpread 800E-12
    8181
    8282  # vertex smearing formula f(z,t) (z,t need to be respectively given in m,s)
    83 
    84   set VertexDistributionFormula {exp(-(t^2/(2*(0.05/2.99792458E8*exp(-(z^2/(2*(0.05)^2))))^2)))}
    85 
    86   #set VertexDistributionFormula { (abs(t) <= 1.0e-09) * (abs(z) <= 0.15) * (1.00) +
    87   #                                (abs(t) >  1.0e-09) * (abs(z) <= 0.15) * (0.00) +
    88   #                               (abs(t) <= 1.0e-09) * (abs(z) > 0.15)  * (0.00) +
    89   #                               (abs(t) >  1.0e-09) * (abs(z) > 0.15)  * (0.00)}
    90 
     83  set VertexDistributionFormula {exp(-(t^2/160e-12^2/2))*exp(-(z^2/0.053^2/2))}
     84 
    9185
    9286}
    … …  
    313307  # Eta shape from arXiv:1306.2016, Energy shape from arXiv:1502.02701
    314308  set ECalResolutionFormula {                  (abs(eta) <= 1.5) * (1+0.64*eta^2) * sqrt(energy^2*0.008^2 + energy*0.11^2 + 0.40^2) +
    315                              (abs(eta) > 1.5 && abs(eta) <= 2.5) * (2.16 + 5.6*(eta-2)^2) * sqrt(energy^2*0.008^2 + energy*0.11^2 + 0.40^2) +
     309                             (abs(eta) > 1.5 && abs(eta) <= 2.5) * (2.16 + 5.6*(abs(eta)-2)^2) * sqrt(energy^2*0.008^2 + energy*0.11^2 + 0.40^2) +
    316310                             (abs(eta) > 2.5 && abs(eta) <= 5.0) * sqrt(energy^2*0.107^2 + energy*2.08^2)}
    317311

  • doc/genMakefile.tcl

    r4a0d9d5 rbd0a1aa  
    7272    dependencies $fileName "$dictName$srcSuf:$suffix$fileName"
    7373
     74    puts -nonewline $dictName$pcmSuf:$suffix
     75    puts -nonewline $dictName$srcSuf
     76    puts {}
     77
    7478    puts -nonewline [file tail $dictName$pcmSuf]:$suffix
    75     puts -nonewline $dictName$pcmSuf$suffix
    76     puts -nonewline $dictName$srcSuf
     79    puts -nonewline $dictName$pcmSuf
    7780    puts {}
    7881  }
    … …  
    416419        @rm $@.arch $@.base
    417420
    418 %Dict$(PcmSuf):
     421$(DELPHES_DICT_PCM): %Dict$(PcmSuf):
     422        @echo ">> Copying $@"
     423        @cp $< $@
     424
     425$(FASTJET_DICT_PCM): %Dict$(PcmSuf):
     426        @echo ">> Copying $@"
     427        @cp $< $@
     428
     429$(DISPLAY_DICT_PCM): %Dict$(PcmSuf):
    419430        @echo ">> Copying $@"
    420431        @cp $< $@
Note: See TracChangeset for help on using the changeset viewer.