Skip to content
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.

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

new package L1Trigger/L1TMuonOverlapPhase1 (new version of the L1 Trigger Overlap Muon Track Finder (OMTF) emulator) #35111

Merged
merged 9 commits into from Oct 5, 2021

Commits on Sep 21, 2021

  1. Copy the full SHA
    dee227f View commit details
    Browse the repository at this point in the history
  2. initial commit of L1Trigger/L1TMuonOverlapPhase1

    the sources were copied from the branch kbunkow/from-CMSSW_11_1_3_KB_v3
    and modified:
    -	changing the include path of the CSCConstants.h,
    -	adding some missing root includes
    -	XMLConfigReader::readLUTs - fill distPhiShift in the LUTs; calculating
    totalInWidth (previously the values were hardcoded);  added flag
    useMeanDistPhi1 (set to false); added parameter buildEmptyPatterns in
    the readPatterns
    -	ProcessorBase::configure - initializing distPhiShift from LUT
    -	L1TMuonOverlapPhase1ParamsESProducer::readPatternsXML  -  added
    reading selDistPhiShift to the LUTs
    -	OMTFConfiguration::configure - added setup for the fwVersion() == 8
    Karol Bunkowski committed Sep 21, 2021
    Copy the full SHA
    66f95fe View commit details
    Browse the repository at this point in the history
  3. using unique_ptr for the GoldenPatternVec and many other changes

    combination of 4 commits:
    1) GoldenPatternVec = std::vector<std::unique_ptr<GoldenPatternType> >
    
    OMTFReconstruction::beginRun modified to adapted to the GoldenPatternVec
    and other changes
    
    added calss EmulationObserverBase
    PatternOptimizerBase::observeProcesorEmulation and findSimMuon moved
    there
    
    DataROOTDumper2 inherits from EmulationObserverBase, removing
    omtfGpResultsPdfSum and omtfGpResultsFiredLayers from OmtfEvent,
    removing gpResultsToPt
    
    removing DataROOTDumper
    
    EventCapture - goldenPatterns is pointer now
    
    removed OMTFSorterWithThreshold
    
    removed PatternsPtAssignment
    
    ProcessorBase<GoldenPatternType>::setGPs removed, code moved to
    constructor
    2) added L1T_OmtfP1_ prefix in the include guards in header files
    
    3) using ESWatcher<L1TMuonOverlapParamsRcd> in the OMTFReconstruction
    
    to prevent the patterns re-creation every run start (if the patterns are
    created from the EventSetup, and not directly from the xml)
    
    4) L1TMuonOverlapPhase1TrackProducer inherits from  edm::one::EDProducer
    
    with edm::one::WatchRuns customization
    Karol Bunkowski committed Sep 21, 2021
    Copy the full SHA
    1b69e9d View commit details
    Browse the repository at this point in the history
  4. code clean-up in L1TMuonOverlapPhase1

    a combination of 10 commits:
    
    1) updating runMuonOvelpap*.py and some .gitignore
    
    commiting
    L1Trigger/L1TMuon/data/omtf_config/Patterns_0x00012_oldSample_3_30Files_grouped1_classProb17_recalib2.xml
    
    2) replacing edm::LogImportant with LogVerbatim in a few places
    
    3) fixes from scram build code-checks
    
    4) changes from scram build code-format
    
    5) changes from scram build code-format
    
    6) a small fix
    
    7) added OMTFConfiguration::printConfig()
    
    8) changing simOmtfPhase1Digis to simOmtfDigis in the .py files
    
    In the
    L1Trigger/L1TMuonOverlapPhase1/python/simOmtfPhase1Digis_cfi.py
    changing the EDProducer("L1TMuonOverlapPhase1TrackProducer" name from
    simOmtfPhase1Digis to simOmtfDigis - this will allow avoid changing this
    name in many .py files in different places in the CMSSW.
    Consequently, this name is changed in all .py files in the
    L1Trigger/L1TMuonOverlapPhase1/test
    
    9) setting dumpResultToXML = cms.bool(False)
    
    commenting out ghostBusterType
    
    10) renaming simOmtfPhase1Digis_cfi.py to simOmtfDigis_cfi.py
    
    in L1Trigger/L1TMuonOverlapPhase1/python/simOmtfDigis_cfi.py:
    - removing ghostBusterType
    - removing bxMin and bxMin, so that the default value 0-0 is used
    
    updating all run*.py files in the L1Trigger/L1TMuonOverlapPhase1/test
    - simOmtfPhase1Digis_cfi > simOmtfDigis_cfi
    - setting bxMin = 0 and bxMax = 0
    Karol Bunkowski committed Sep 21, 2021
    Copy the full SHA
    455f4f8 View commit details
    Browse the repository at this point in the history
  5. Switching to the new OMTF emulator

    In
    DQM/L1TMonitor/python/L1TStage2Emulator_cff.py
    and
    L1Trigger/L1TMuon/python/simDigis_cff.py
    changing:
    L1Trigger.L1TMuonOverlap.simOmtfDigis_cfi to
    L1Trigger.L1TMuonOverlapPhase1.simOmtfDigis_cfi
    
    addionally in L1TStage2Emulator_cff.py setting
    bxMin = cms.int32(-3),
    bxMax = cms.int32(4)
    for valOmtfDigis (i.e. simOmtfDigis)
    Karol Bunkowski committed Sep 21, 2021
    Copy the full SHA
    8d8a862 View commit details
    Browse the repository at this point in the history
  6. deleting files and dirs that are not needed

    deleting L1Trigger/L1TMuon/data/omtf_config
    
    deleting some files from L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf
    old py files, or some that are using the L1MuonAnalyzerOmtf from the
    usercode
    
    removing test/runMuonOverlapWriteToXml.py
    Karol Bunkowski committed Sep 21, 2021
    Copy the full SHA
    dcd88a1 View commit details
    Browse the repository at this point in the history
  7. changes requested by Clang Build

    In AngleConverterBase.cc and OmtfAngleConverter.cc getGlobalEtaDt and getGlobalEtaDt: removing not needed usage of unique_ptr with DTTrigGeom and DTChamber. Making bounds const
    
    OMTFinputMaker.cc  CscDigiToStubsConverterOmtf::acceptDigi: moving declaration of the aMin and aMax
    
    OMTFReconstruction.cc:  adding protection against building OMTFProcessor  with omtfParams = nullptr
    
    in OmtfAngleConverter.h adding
    using AngleConverterBase::getGlobalEta
    to avoid  Clang Warnings "hides overloaded virtual functions"
    
    adding missing const to AngleConverterBase::getGlobalEta
    
    removing
    L1Trigger/L1TMuonOverlapPhase1/interface/Tools/PatternOptimizer.h
    
    removing gpProbabilityStat from
    L1Trigger/L1TMuonOverlapPhase1/interface/Omtf/GoldenPatternWithStat.h
    Karol Bunkowski committed Sep 21, 2021
    Copy the full SHA
    84982d4 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2021

  1. code cleanup

    rebased to the CMSSW_12_1_X_2021-09-20-2300
    
    removing commented old pieces of code, cleaning up codes in many places
    
    LogTrace("l1tOmtfEventPrint") is used instead of cout in commented debug
    code
    
    removing not needed use of unique_ptr in Omtf/OmtfAngleConverter.cc and
    AngleConverterBase.cc
    
    constructor of OMTFinputMaker: argument angleConverter is now unique_ptr
    - to make sure OMTFinputMaker take the ownership of the angleConverter
    
    removed GpResultsToPt.h and GpResultsToPt.cc
    
    adding test/runMuonOverlap_run2_data.py,  runMuonOverlap_run3_data.py,
    runMuonOverlap_run3_mc.py
    Karol Bunkowski committed Sep 23, 2021
    Copy the full SHA
    a8d4e08 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2021

  1. correcting valOmtfDigis in the L1TStage2Emulator_cff.py

    in the L1Trigger/L1TMuonOverlapPhase1/python/simOmtfDigis_cfi.py: adding
    bxMin and bxMx as cms.int32 (with defoult values i.e. 0)
    
    in the DQM/L1TMonitor/python/L1TStage2Emulator_cff.py
    not using cms.int32 for simOmtfDigis.bxMin and bxMax, but ordinary
    numbers
    Karol Bunkowski committed Sep 24, 2021
    Copy the full SHA
    b8d8a96 View commit details
    Browse the repository at this point in the history