HF 1x1 TP production along 2x3 TP #12654
Conversation
Doing some basic clean up (adding braces, defining consts, breaking up lines) so that future content edits are easier to understand.
Conflicts: SimCalorimetry/HcalTrigPrimAlgos/src/HcalTriggerPrimitiveAlgo.cc
Added a shift, hf_lumi_shift, to correct for lumi bits stuck on the front of the array that are used by lumi but not trigger. We correct these based on the given rctlsb. Also add a MAX_OUTPUT = 1023 test to analyzeHFV1 to prevent overflow.
Add HcalFeatureHFEMBit class Implemented a class HcalFeatureHFEMBit that makes a cut based on energy deposited in the short fiber verse the long fiber. cleaned up part of the code caused by mistaken copy pastecleaned up part of the code caused by mistaken copy pastecleaned up part of the code caused by mistaken copy paste... some formatting issues were fixed.
The L1RCTs only work with the old segmentation (version 0 for <= 2012), so if the version is anything else, we continue. Changed the python file so that the HcalFeatureHFEMBit is not used.
Conflicts: Geometry/HcalTowerAlgo/src/HcalTrigTowerGeometry.cc Geometry/HcalTowerAlgo/test/HcalGeometryTest.cpp
…aloTPGTrascoderULUT mostly) Conflicts: CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc Geometry/HcalTowerAlgo/src/HcalTrigTowerGeometry.cc Geometry/HcalTowerAlgo/test/HcalGeometryTest.cpp SimCalorimetry/HcalTrigPrimAlgos/src/HcalTriggerPrimitiveAlgo.cc
Conflicts: CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h CaloOnlineTools/HcalOnlineDb/src/HcalLutManager.cc DataFormats/HcalDetId/src/HcalTrigTowerDetId.cc L1TriggerConfig/L1ScalesProducers/src/L1CaloHcalScaleConfigOnlineProd.cc
We now have up to two versions of HFTPs being handled by HcalTrigTowerGeometry, so the unit test must figure out how many it expects and test for that number. Conflicts: Geometry/HcalTowerAlgo/test/HcalGeometryTest.cpp
|
A new Pull Request was created by @matz-e (Matthias Wolf) for CMSSW_8_0_X. It involves the following packages: CalibCalorimetry/CaloTPG @civanch, @diguida, @ianna, @mdhildreth, @cmsbuild, @franzoni, @Dr15Jones, @cerminar, @ggovi, @mmusich, @mulhearn, @davidlange6 can you please review it and eventually sign? Thanks. Following commands in first line of a comment are recognized
|
|
+1 |
|
matz-e@6f1b329 and matz-e@d724d25 remove |
|
+1
|
|
+1 |
|
+1 |
Adresses two of the three leftover issues with cms-sw#12654.
|
@diguida: does this comparison fix the rest of your comments? I can open a new PR with the commits once this is in. |
|
@diguida |
|
@abdoulline I have already approved it. |
|
@matz-e the changes in your new branch look ok to me. Thanks! |
| std::vector<unsigned int> analyticalLUT(OUTPUT_LUT_SIZE, 0); | ||
| std::vector<unsigned int> identityLUT(OUTPUT_LUT_SIZE, 0); | ||
| std::vector<unsigned int> analyticalLUT(OUTPUT_LUT_SIZE, 0); | ||
| std::vector<unsigned int> identityLUT(OUTPUT_LUT_SIZE, 0); |
There was a problem hiding this comment.
if these have a fixed, known size, make them std::arrays. Especially good for both bounds checking and if you happen to be putting this sort of construct into a map
HF 1x1 TP production along 2x3 TP
Address outstanding comments from #12654 (1x1 HF TP)
This is a port of Alex Gude's PR #6614, but only the modifications done to the TP algorithm and the
HcalTowerAlgo. The only errors I see withrunTheMatrix.pyare marked as coming from DAS.This will add the 1x1 HF TP in the same collection as 2x3 HF TP, but the RCT already has a check in place to use only 2x3. To actually produce 1x1 TP, new LUT metadata is needed, either by supplying them manually or through a new globaltag. 2x3 production should not be affected by this.