Integration of topic branches

[mulhearn]

The various topic branches have been combined into an integration branch for 80x

• https://github.com/cms-l1t-offline/cmssw/tree/l1t-integration-pass4-80x

Meanwhile, we are developing a working recipe for TSG studies here

• https://github.com/cms-l1t-offline/cmssw/tree/l1t-dev-recipe-CMSSW_7_6_0 (
  integration branch synced to 4c2e934)

Active developer branches brought into sync periodically:

• https://github.com/cms-l1t-offline/cmssw/tree/l1t-muon-pass2-CMSSW_8_0_0_pre5 integrated (at commit 8b7701a)
• https://github.com/cms-l1t-offline/cmssw/tree/l1t-calostage2-CMSSW_8_0_0_pre4 (merged indirectly via dev-recipes branch, see note above)
• https://github.com/cms-l1t-offline/cmssw/tree/l1t-calostage2-CMSSW_7_6_0 (no sync needed so far)

Deprecated branches with no further expected developer, already integrated are:

• https://github.com/cms-l1t-offline/cmssw/tree/l1t-muon-CMSSW_8_0_0_pre1 integrated (at commit b295cbb) (deprecated: move to pre4 at 7c87731)
• https://github.com/cms-l1t-offline/cmssw/tree/l1t-global-dev-CMSSW_7_6_0 integrated (at commit 90d1e18)
• https://github.com/cms-l1t-offline/cmssw/tree/l1t-sequences-80X integrated (at commit b54c4d7)
• https://github.com/cms-l1t-offline/cmssw/tree/l1t-stage2calo-CMSSW_7_6_0_pre7 (updates in dev recipe branch below bring this up to c86c916) This branch is now obsolete for development.
• PR Level-1 Trigger changes for HI Firmware cms-sw/cmssw#12176 (HI updates and new CaloParamsHelper class)
  c86c916

Not yet integrated:

• https://github.com/cms-l1t-offline/cmssw/tree/l1t-calolayer1-CMSSW_8_0_0_pre4

[mulhearn]

Noting conflicts from merging stage2 and global dev branches:

        DataFormats/FEDRawData/test/DumpFEDRawDataProduct.cc
        EventFilter/L1TRawToDigi/src/implementations_stage2/CaloTowerUnpacker.cc
        EventFilter/L1TRawToDigi/src/implementations_stage2/GTSetup.cc
        EventFilter/L1TRawToDigi/src/implementations_stage2/GlobalAlgBlkUnpacker.cc
        EventFilter/L1TRawToDigi/src/implementations_stage2/MPUnpacker.cc
        EventFilter/L1TRawToDigi/src/implementations_stage2/MuonPacker.cc
        EventFilter/L1TRawToDigi/src/implementations_stage2/MuonUnpacker.cc
        EventFilter/L1TRawToDigi/utils/unpackData-CaloStage2.py
        L1Trigger/L1TCalorimeter/macros/compHwEmu.C
        L1Trigger/L1TCalorimeter/plugins/L1TStage2CaloAnalyzer.cc
        L1Trigger/L1TCalorimeter/python/caloStage2Params_cfi.py
        L1Trigger/L1TCalorimeter/python/l1tStage2CaloAnalyzer_cfi.py
        L1Trigger/L1TCalorimeter/test/runEmulator-CaloStage2.py

I kept the MuonPacker/MuonUnpacker from muon branch.
I kept the GTSetup/GlobalAlgBlkUnpacker from global branch.
Everything else I used version in Stage-2 branch.

[mulhearn]

L1TMuon/data should already be in an integration build. L1TCalorimeter/data PR is here: cms-data/L1Trigger-L1TCalorimeter#5

[mulhearn]

Noting that we should add in cms-sw#12176 as well, which will conflict with stage-2 updates to CaloParams. OK, this is merged in now, for the record, the conflicts were:

    CondFormats/L1TObjects/interface/CaloParams.h
    L1Trigger/L1TCalorimeter/interface/Stage2Layer2TauAlgorithmFirmware.h
    L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc
    L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2DemuxSumsAlgoFirmwareImp1.cc
    L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2EGammaAlgorithmFirmwareImp1.cc
    L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2EtSumAlgorithmFirmwareImp1.cc
    L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2JetAlgorithmFirmwareImp1.cc
    L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2JetSumAlgorithmFirmwareImp1.cc
    L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2TauAlgorithmFirmwareImp1.cc
    L1Trigger/L1TCalorimeter/src/firmware/Stage2TowerDecompressAlgorithmFirmwareImp1.cc

These were straightforward to fix by simply keeping the stage2 version of new algorithm but adding Alex swapout of CaloParams for CaloParamsHelper, and moving a few new things from Stage2 into the helper class.

[mulhearn]

For future reference, I bet if I had tried

git merge -Xignore-space-change

that would have gone even easier... given @richard-cms's penchant for whitespace changes ;-)

[mulhearn]

OK, the 80x integration branch is ready.

[mulhearn]

The 76X integration branch is also ready.

[mulhearn]

Looks like something went wrong with the standard sequences integration... missing files. Erasing history of that commit for now in the integration branches.... Fixed.

[mulhearn]

Noting this PR which should be merged into integration branch too:
#105

[mulhearn]

Because of the many updates in the dev recipe branch, was easiest to make new integration branches. The 76x version is done and fully up to date with dev recipe branch, but the 80X branch is still in works.

[mulhearn]

The 80x integration branch is core dumping when I run our unit tests... investigating. It also missed the L1Trigger/HardwareValidation package. Need to talk to consumers of this one....

[mulhearn]

OK, 80x integration branch is now working. Only thing missing wrt 76x is the updates related to L1Trigger/HardwareValidation. Investigating those now.

[mulhearn]

Lately the workflow has changed to updating dev-recipes first, then into integration branch via "git rebase --onto"... so this page is obsolete: status of topic branches is maintained in dev-recipes topic. Closing this issue.