Pr90x l1t integration (v89.15) fix SumEt, uGT prescales, memory leaks, clean-up #16967

rekovic · 2016-12-11T04:37:16Z

This is PR 90x. Replaces #16718. (PR 80x version is #16966).

It is needed in 80x for multiple reasons:

HI MC production
Analysis of Trigger of 2016 runs

It is needed for 81x:

If needed to run Stage2 calorimetry for L1T studies with Phase2 Tracker TDR samples.

Compared to #16717 it has:

fix to SumEt packer introduced in 8_0_22
fix in GT prescales to cover all 512 files
fixes a problem of a few missing commits

(For completion)PR #16717 Includes all fixes for the L1T emulator:

BMTF unpacker memory leak
TwinMux memory leak (already in 81x, so not present here)
Layer2 emulator to do what in FW (bug in FW tower max eta in TowerCount for HI)
Turn off warnings in L1T Ntuple maker.
uGT handling of saturated Et bins in CorrelationConditions to be as in FW.

…nasevich). L1CaloTowerTreeProducer produces spurious warning messages when trying to fill the CaloCluster tree. CaloClusters aren't produced in real data (only emulator).

Conflicts: L1Trigger/L1TGlobal/data L1Trigger/L1TMuon/data

…ust as the emulator does. This facilitates unit-test comparisions between simulated EtSums and SIM+PACK+UNPACK EtSums, as the order is preserved.

…t change in FW is to set MaxEta=27 for TowerCount. So we do the same here.

…->27 for TowerCount. Set as default. Revert caloStage2Params 3_3 to have as originally towerEtaMax 28 for TowerCount.

…rapolation with https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideMuonAnalysisMuonAssociators Conflicts: L1Trigger/L1TMuon/data

…quence Conflicts: L1Trigger/L1TMuon/data

…ff needed by l1MuonReco. Conflicts: L1Trigger/L1TMuon/data

Conflicts: L1Trigger/L1TMuon/data

rekovic · 2016-12-11T04:37:30Z

+1

cmsbuild · 2016-12-11T06:04:38Z

+1
Tested at: 231a99b
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-16967/16954/summary.html

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
e87021a
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-16967/16954/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-16967/16954/git-merge-result

cmsbuild · 2016-12-11T06:04:41Z

Comparison job queued.

cmsbuild · 2016-12-11T07:06:24Z

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-16967/16954/summary.html

rekovic · 2016-12-12T02:50:58Z

please test

cmsbuild · 2016-12-12T02:51:17Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/16962/console Started: 2016/12/12 03:51

cmsbuild · 2016-12-12T05:05:21Z

+1
Tested at: 231a99b
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-16967/16962/summary.html

cmsbuild · 2016-12-12T05:05:24Z

Comparison job queued.

cmsbuild · 2016-12-12T07:20:06Z

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-16967/16962/summary.html

davidlange6 · 2016-12-12T08:49:25Z

EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerInputs.cc

@@ -36,7 +36,7 @@ namespace l1t
 				return (value == 0);
 		}

-		bool unpacking(const Block& block, UnpackerCollections *coll, std::map<int, qualityHits>& linkAndQual_, const bool& isNewFw)
+		bool unpacking(const Block& block, UnpackerCollections *coll, qualityHits& linkAndQual_, const bool& isNewFw)


@rekovic - in a followup PR, please change the name of linkAndQual_ to be comply with the usual naming convention (blah_ is for class member data)

davidlange6 · 2016-12-12T08:50:18Z

EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerInputs.cc

@@ -36,7 +36,7 @@ namespace l1t
 				return (value == 0);
 		}

-		bool unpacking(const Block& block, UnpackerCollections *coll, std::map<int, qualityHits>& linkAndQual_, const bool& isNewFw)
+		bool unpacking(const Block& block, UnpackerCollections *coll, qualityHits& linkAndQual_, const bool& isNewFw)


otherwise, this function is really not used in CMSSW?

davidlange6 · 2016-12-12T08:51:11Z

L1Trigger/L1TCalorimeter/python/hackConditions_cff.py

@@ -39,10 +39,10 @@
 if stage2L1Trigger.isChosen():
    if pA_2016.isChosen():
        print "L1TCalorimeter Conditions configured for Stage-2 (2016 pA) trigger. "
-        from L1Trigger.L1TCalorimeter.caloStage2Params_2016_v3_3_HI_cfi import *    
+        from L1Trigger.L1TCalorimeter.caloStage2Params_2016_v3_3_1_HI_cfi import *    


in a separate PR, the 'isChosen()' will need to be removed

I am sorry I missed it, what should be used instead of "isChosen()".

And is this replacement only needed for 90x PR?

no, will be needed to back port too

davidlange6 · 2016-12-12T22:19:51Z

+1

eparadas and others added 29 commits November 22, 2016 03:07

Update BMTFUnpackerInputs.h

4dcc89b

Update BMTFUnpackerInputs.cc

f6273d7

Update BMTFUnpackerInputs.cc

7bee693

Turn off the warning if the l1ClusterToken is empty () or none (L.Apa…

7682c3e

…nasevich). L1CaloTowerTreeProducer produces spurious warning messages when trying to fill the CaloCluster tree. CaloClusters aren't produced in real data (only emulator).

Change handling of overflow/saturated Et value

0e63af9

Conflicts: L1Trigger/L1TGlobal/data L1Trigger/L1TMuon/data

Push the EtSum kTowerCount at the end of bx vector in the Unpacker, j…

92f228e

…ust as the emulator does. This facilitates unit-test comparisions between simulated EtSums and SIM+PACK+UNPACK EtSums, as the order is preserved.

Patch for tower count emulator

1bca11c

Until FW is fixed so that TowerMaxIEta=28 does not include HF. Curren…

44bb033

…t change in FW is to set MaxEta=27 for TowerCount. So we do the same here.

Import eras, not available by default in 90x.

0fcb688

CorrCondition: use [] operator instead at().

0ecd9d3

Merged refs/pull/16718/head from repository cms-sw

e87021a

Add L1TGlobal data files.

769c246

Add L1T Calorimeter data files.

edf9315

new caloStage2Params 3_3_1 to reflect the change in FW towerEtaMax 28…

b80d6aa

…->27 for TowerCount. Set as default. Revert caloStage2Params 3_3 to have as originally towerEtaMax 28 for TowerCount.

New prescale table with entries for 512 algorithms

3ad5e49

Switch default to UGT_BASE_RS_PRESCALES_v11.xml

bcf3ff1

Add extrapolated muon eta dn phi at the 1st adn 2nd muon station. Ext…

bcd5b99

…rapolation with https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideMuonAnalysisMuonAssociators Conflicts: L1Trigger/L1TMuon/data

Add extrapolated phi and eta of muons to L1 ntuples

3cfc8a6

removing unused simMuonQualityAdjusterDigis module from SimL1TMuon se…

1c5382e

…quence Conflicts: L1Trigger/L1TMuon/data

L1NtupleAOD configuration: add missing configuration Reconstruction_c…

70ba6c2

…ff needed by l1MuonReco. Conflicts: L1Trigger/L1TMuon/data

Update list of triggers to match

5dbcbe6

Conflicts: L1Trigger/L1TMuon/data

Set correct input collection name for TF muon ntuplizer

14f7ddd

Conflicts: L1Trigger/L1TMuon/data

Fix etSumUnpacker tower count

18128f6

Fix etSumUnpacker tower count p4

ac57883

Add etem to latest MP unpacker

23fceb6

Small fix to MPUnpacker, add HT saturation check in emulator

60411c9

Fix compile error - missing parenthesis.

83e42a9

Removing data files.

20fd99a

New prescale table with entries for 512 algorithms

231a99b

cmsbuild added tests-approved and removed tests-started labels Dec 11, 2016

cmsbuild added comparison-available and removed comparison-pending labels Dec 11, 2016

cmsbuild added comparison-pending tests-pending tests-started and removed comparison-available tests-approved tests-pending labels Dec 12, 2016

cmsbuild added tests-approved and removed tests-started labels Dec 12, 2016

cmsbuild added comparison-available and removed comparison-pending labels Dec 12, 2016

davidlange6 reviewed Dec 12, 2016

View reviewed changes

cmsbuild added orp-approved and removed orp-pending labels Dec 12, 2016

cmsbuild merged commit 4f05b52 into cms-sw:CMSSW_9_0_X Dec 12, 2016

rekovic mentioned this pull request Dec 14, 2016

90x L1T - remove an external data file #17016

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pr90x l1t integration (v89.15) fix SumEt, uGT prescales, memory leaks, clean-up #16967

Pr90x l1t integration (v89.15) fix SumEt, uGT prescales, memory leaks, clean-up #16967

rekovic commented Dec 11, 2016 •

edited

rekovic commented Dec 11, 2016

cmsbuild commented Dec 11, 2016

cmsbuild commented Dec 11, 2016

cmsbuild commented Dec 11, 2016

rekovic commented Dec 12, 2016

cmsbuild commented Dec 12, 2016 •

edited

cmsbuild commented Dec 12, 2016

cmsbuild commented Dec 12, 2016

cmsbuild commented Dec 12, 2016

davidlange6 Dec 12, 2016

davidlange6 Dec 12, 2016

davidlange6 Dec 12, 2016

rekovic Dec 12, 2016

rekovic Dec 12, 2016

davidlange6 Dec 12, 2016

davidlange6 commented Dec 12, 2016

Pr90x l1t integration (v89.15) fix SumEt, uGT prescales, memory leaks, clean-up #16967

Pr90x l1t integration (v89.15) fix SumEt, uGT prescales, memory leaks, clean-up #16967

Conversation

rekovic commented Dec 11, 2016 • edited

rekovic commented Dec 11, 2016

cmsbuild commented Dec 11, 2016

cmsbuild commented Dec 11, 2016

cmsbuild commented Dec 11, 2016

rekovic commented Dec 12, 2016

cmsbuild commented Dec 12, 2016 • edited

cmsbuild commented Dec 12, 2016

cmsbuild commented Dec 12, 2016

cmsbuild commented Dec 12, 2016

davidlange6 Dec 12, 2016

Choose a reason for hiding this comment

davidlange6 Dec 12, 2016

Choose a reason for hiding this comment

davidlange6 Dec 12, 2016

Choose a reason for hiding this comment

rekovic Dec 12, 2016

Choose a reason for hiding this comment

rekovic Dec 12, 2016

Choose a reason for hiding this comment

davidlange6 Dec 12, 2016

Choose a reason for hiding this comment

davidlange6 commented Dec 12, 2016

rekovic commented Dec 11, 2016 •

edited

cmsbuild commented Dec 12, 2016 •

edited