-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Make Magnetic field geometry persistent. #135
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
ianna
commented
Jul 18, 2013
- This fixes compilation problem of XMLIdealMagneticFieldGeometryESProducer.
Merged
ktf
added a commit
that referenced
this pull request
Jul 18, 2013
Make Magnetic field geometry persistent.
Closed
tahuang1991
pushed a commit
to tahuang1991/cmssw
that referenced
this pull request
Apr 22, 2014
…-SLHC11 adjust LCT pattern and quality
nclopezo
pushed a commit
to nclopezo/cmssw
that referenced
this pull request
Nov 21, 2014
PR tests now automatically takes the latest available release.
mariadalfonso
added a commit
to mariadalfonso/cmssw
that referenced
this pull request
May 6, 2017
New trainings 1D 2L
slava77
pushed a commit
to slava77/cmssw
that referenced
this pull request
Oct 9, 2021
Update validation to use a higher number of layers/hits to define good reference/reco tracks
atownse2
pushed a commit
to atownse2/cmssw
that referenced
this pull request
Mar 15, 2022
sarafiorendi
pushed a commit
to sarafiorendi/cmssw
that referenced
this pull request
Jun 10, 2022
sarafiorendi
pushed a commit
to sarafiorendi/cmssw
that referenced
this pull request
Jun 13, 2022
cmsbuild
pushed a commit
that referenced
this pull request
Oct 13, 2022
Include commit from fw_synch_210611 (#86) * Fixes to remove unused TPROJ memory and fix problem with VMR LUT in L6 * apply code-formats and code-checks Co-authored-by: Anders <[email protected]> Update Settings.h (#89) TE truncation reduced from 108 to 107, as requested in cms-L1TK#85 Update geometry and MC files (#91) L1 tk dev 12 0 0 pre4 hph (#94) * First Commit * Code Format * Fix Typo * Naming Rule * Chris' 2nd Comment Co-authored-by: Jack Li <[email protected]> Reduced configuration (#87) * Modified code to support a reduced config (the summer chain) * Updates from running code checker. * Reverted to standard configuration options. * Reverted to standard configuration options. * Settings used to make TV for event 1912 * Reverted to default settings for PR. * Made some of the TV changes in issue 85, and created output TVs 2021-08-04-TTbar-SimpleFWHarmonization. * Clarified comments * Include commit from fw_synch_210611 (#86) * Fixes to remove unused TPROJ memory and fix problem with VMR LUT in L6 * apply code-formats and code-checks Co-authored-by: Anders <[email protected]> * Returning to standard config. * Returning to standard config. * Returning to standard config. * Update geometry and MC files (#91) * Included reduced variable in non-reduced setups for consistency. * Updated settings to match default configuration rather than HLS compatibility * Added comment about reduced config files Co-authored-by: Tova Holmes <[email protected]> Co-authored-by: Louise Skinnari <[email protected]> Co-authored-by: Anders <[email protected]> Co-authored-by: Ian Tomalin <[email protected]> Revert "L1 tk dev 12 0 0 pre4 hph (#94)" (#95) This reverts commit 3b2f139. fix getPhiRes function (#97) New KF (hand merged with L1TK-dev-12_0_0_pre4) (#88) * initial commit. * renamed KFout producer to TT producer * KFout producer and analyzer added. Producer is so far only a skeleton. * small includings fix. * quick TTTypes fix * comments for ian * initial commit. * renamed KFout producer to TT producer * KFout producer and analyzer added. Producer is so far only a skeleton. * small includings fix. * quick TTTypes fix * comments for ian * small script modifications * little ntuple maker mod. * readding fake fit config interface. * track tigger association added, not in the best way. * tttrack associator added as it should be. * option to use TTStubAssMap to associate TTTracks with TPs removed and output module cleaned up. * Added Hybrid_NewKF * Added comment * Update L1TrackNtupleMaker_cfg.py fix typo made by Ian * added tmtt costumization and fakefit option to tracklet config * data format fix * README filled and Configuration.StandardSequences.L1TrackTrigger_cff removed from run scripts. * associateFinal added to StubAssociation. * Update README.md English corrections * minor changes in various comments. * KF 7 layer tracking debugged and defaulted. * turned supported geometry white list into a black list. * Cbrown kfout (#93) * Initial Commit for Kfout emulator * with ttTrackRefMap back in * Correct link structure and eta routing * No more print statements * Remove print statements * Merge changes in kfout producer * Thomas' comments #1 * Thomas' comments #2 * Change dphi/dz LUT scaling to num of bits * Fix bug to phi sector correction * sync with FW fix * Commit of distribution server for clock accuracy * Fix to undefined operation on numLinkTracks * Fix to numLinkTracks #2 Co-authored-by: Ian Tomalin <[email protected]> Co-authored-by: Chriisbrown <[email protected]> fix of KFin EnableTruncation option. (#99) * quick fix of KFin EnableTruncation option. * both, enable and disabel truncation fixed. Fix to KF out for multiple KF workers (#100) code-format, llvm-ccdb and clang-tidy (#103) Fixed clang errors (#104) several bug fixes. (#108) * bug fixes. * code format * GlobalTag update. * forgot a bug fix in AnalyzerDemonstrator. add number of TTCluster to DTC analzyer end job summary (#109) * count of TTCluster added to endjob summary printout. * rebase to L1TK-dev-12_0_0_pre4 and code format. Added git CI (#106) * Added git CI * Run CI on PR to any branch * Make L1TRKALGO configurable * tweak * Added script to skim MC datasets for git CI * Remove L1TRKALGO option * Gave CI more sensible name Update github_CI.yml temporary debug check Memory cleanup (#98) * Cleanup of writing leading 0x in memories * Cleanup of obsolote comment * Change order of input links to match VMRouter expectation * Add support for debugging * Remove one pipelining step to match HLS * Determine the PS vs 2S in disks same way as we do in HLS * Some cleanup * Correction to LUT code * Comment out printout * Ran scram build code-format * Update comment about IR steps * Cleanup of obsolote comment * Remove one pipelining step to match HLS * Determine the PS vs 2S in disks same way as we do in HLS * Correction to LUT code * Ran scram build code-format phiprojder bug fix (#116) Channel Assignment TrackBuilder output Tracks + Stubs and InputRouter input Stubs (#110) * track builder channel upgraded to assign stubs to channel. * code format * readded missing pieces. * renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping * name change in L1Trigger/TrackFindingTracklet/python/ProducerKF_cff.py * bug fix * name change of config parameter * code-format * namespace change and consitency check added. * addressing ians comments * addressing ians comments TP_minPt and binning fix (#118) Updated VMR maxstep to 107 (originally 108) to match firmware (#119) Minor improvements (#120) * Minor improvements * Added comments Dropped MC to 104 iterations (#123) - Full agreement with HLS Fixing integer range check in FPGAWord. (#125) * fixing integer range check in FPGAWord. * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Slight rewerite to use <= instead < and not do subtracktion * Fix < to <= to avoid overflow by one Co-authored-by: Brent R. Yates <[email protected]> Co-authored-by: Anders <[email protected]> Fix KF Track Parameter Digitization (#127) * Fix KF Track Parameter Digitization * Add comments to Track.h summer chain demonstrator (#111) * track builder channel upgraded to assign stubs to channel. * renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping * ProducerIRin and ProducerTBout added, Demonstrator configured by default to use them. * rebase with tschuh_TrackBuilder and code format * StreamsStub added as EDProduct of L1FPGATrackProducer * code format. * convert only finally accepted Tracklets to StreamsStub. * undo last commit, adding trackword ed product and adding gaps to stubs and tracks to get clock accurate emulation. * swap bugfix. * rebased and name change of TrackBuilderChannel adopted. * fixing rebase errors. * fixing more rebase errors. * fixing even more rebase errors. * first comments from Ian. * code format * second comments from Ian. * code format * Ians third comments. * Ians 4th comments. * small merge error fix * Added comment * Refine comment * miniscule comment change Co-authored-by: Ian Tomalin <[email protected]> Fixed comparisons to avoid overflow. (#128) MP HLS agreement fixes (#126) * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Fixes to get agreement with HLS code * fixing integer range check in FPGAWord. * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Slight rewerite to use <= instead < and not do subtracktion Co-authored-by: Brent R. Yates <[email protected]> Co-authored-by: Thomas Schuh <[email protected]> Update Settings.h (#130) Fix "storeTrackBuilderOutput_" typo Update Setup.cc (#129) Change trackerDTC::Setup to tt::Setup . (Bug fix) Update LayerEncoding.h (#131) * Update LayerEncoding.h Add function to access layer corresponding to given DTC channel. (Needed by L1Trk Future CMSSW code). * Update LayerEncoding.h response to comment + fix to previous commit * Update LayerEncoding.cc Initialize data member numDTCsPerRegion_ * Update LayerEncoding.h added comment * Update LayerEncoding.h clarified comment Test vector fixes (#132) * Made eventProcessor a member of the producer. * Output TC tables in the reduced config. MP cleanup 220208 + MC fix (#133) * fixing integer range check in FPGAWord. * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Slight rewerite to use <= instead < and not do subtracktion * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Some updates to MP to converge with HLS code * Further clenup of the MP code * More cleanup -removal of hardcoded numbers * Further cleanup * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * fixing integer range check in FPGAWord. * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Slight rewerite to use <= instead < and not do subtracktion * Some updates to MP to converge with HLS code * Further clenup of the MP code * More cleanup -removal of hardcoded numbers * Further cleanup * Fixes to the MC to allow full agreement with HLS * Added a comment header and pipeline description * Added comment about MC iterations Co-authored-by: Thomas Schuh <[email protected]> Co-authored-by: Anders <[email protected]> customize L1FPGATrackProducer (#112) * track builder channel upgraded to assign stubs to channel. * renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping * StreamsStub added as EDProduct of L1FPGATrackProducer * code format. * convert only finally accepted Tracklets to StreamsStub. * undo last commit, adding trackword ed product and adding gaps to stubs and tracks to get clock accurate emulation. * swap bugfix. * rebased and name change of TrackBuilderChannel adopted. * fixing rebase errors. * fixing more rebase errors. * fixing even more rebase errors. * track builder channel upgraded to assign stubs to channel. * renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping * StreamsStub added as EDProduct of L1FPGATrackProducer * rebased and name change of TrackBuilderChannel adopted. * criteria to build track updated, TBout works now for all seed types. * StreamsStub added as EDProduct of L1FPGATrackProducer * use customize function to manipulate L1FPGATrackProducer configuration * rebase to tschuh_SummerChain, customize updated to set EmulateTB, demonstrator counts now the amount of passed events. * initial counter values fixed. * rebase and reduce config customize function extended * fixing merge errors. * Ians first comments. * rebase and Ians secodn comments. * Update ChannelAssignment_cfi.py * Ians third comments. * Ians fourth comments. Co-authored-by: Ian Tomalin <[email protected]> Update Customize_cff.py (#135) TBout analyzer (#114) * Reviewed. * one merge error fixed, but a problem remains * fixed second error. * Update AnalyzerTBout.cc Co-authored-by: Ian Tomalin <[email protected]> Fix d0 bias (#124) * Fix d0 bias * Documented KF maths and variables Ian tidy up (#137) * Added function to convert ATCA slot to DTC name * Moved dtcname to Settings.h and put underscore at end of settings * Declared functions const if dont change data members * Added comments to clarify params overridden by python cfg * Added comment * Removed duplicate function TCNAme disable truncation for displaced tracking (#142) DTC phi range hard-wired constants removed (#141) * Added function to get num ATCA slots * Added comment * Automatically calc DTC phi ranges * Improved comments * Added comment * Simplified phi offset calc * Fixed missing half-sector rotation bug * Added comments * Changed dtcphirange.txt to numbers instead of C++ code Displaced tracking phi fix (#147) * usephiapprox on modify NtupleMaker cfg for grid jobs * added displaced terms to phi calculation in TrackletCalculatorDisplaced * reverting changes unrelated to phi correction Jack hph (#146) * First Commit * Code Format * Fix Typo * Naming Rule * Chris' 2nd Comment * Fixing Bug * Ian's 1st Comments * Ian's 2nd Comment: Remove SensorModule Class * Ian's 3rd comment: Get rid of magic numbers * Ian's 4th Comment: Add more clarification * Code-check Co-authored-by: Jack Li <[email protected]> Adding new features to ntuplemaker (#148) Co-authored-by: Jack Li <[email protected]> Update StubAssociation.cc (#145) as requested a separate PR. Update github_CI.yml Fixed incorrect comment KFin emulator (#143) * initial commit. * move ProducerTBout.cc from test to plugins * KFin fully debugged. * Producer TBout added to NTupleMaker * chriss change to KFout * Louises first comments. * fixing rebase errors. * KF reintegrated, stub residuals are not bit accurate yet. * code format. * added 1k ttbar@0PU events for internal kf maths tuning. * Track builder r residual debug and KF digi function corrected. * bug in z residual base fixed. * Ians first comments. * Ians secodn comments. * recalculate z ressid from TTStubRefs, use TTStubRefs for seed stubs instead of fake stubs. * Ians third comment. * fixed comments TTDTC::Frames -> tt::Frames * old stub uncertainty caclulation re-enabled. * Ians 4th comments. * code-checks. * tilted stub z uncertainty fixed. not yet debugged against f/w. * set max layers a kff adds to a track to 7 as we did in the past, no clue why it is 4 again ... * agrrement with f/w, ready to merge. Fix rare crash in KF (#151) * Fix rare crash in KF * Fixed line break Removed obsolete parameter. (#152) quick ntuple fix (#153) * L1TrackNtupleMaker_cfg.py updated reduced workflow. * further cleaning. Update L1TrackNtupleMaker_cfg.py fixed typo Removal of dependencies of ChannelAssignement (#144) * This code includes a new implementation of the Track and Stub Streams generation. The old code is still running in parallel. * Remove code for old calculation of stream data - keeping the debug print out in this commit * Remove debud printout * added numSeedTypes function * rebased Anders branch * rebased Anders branch * tidied up Anders branch * tidied up Anders branch * ran scram b code-format * Thomas PR review comments * max num of proj layers added to channel assignment. * merge with Thomas commit Co-authored-by: Ian Tomalin <[email protected]> Co-authored-by: Thomas Schuh <[email protected]> Ran second auto formatter tool (#154) * Ran second auto formatter tool * tweak Update ProducerSetup_cfi.py correct comment in code Update Customize_cff.py add comment in code Tracklet Processor Displaced (#159) * Tracklet Processor Displaced * code-format * code-format again * remove unnecessary comments and add explanation for header file * implement more comments * remove more magic numbers Update track quality chi2 bins (#161) * update chi2 bins * change chi2 variables to be per dof Ian L1TStub bug fix (#160) * Ran second auto formatter tool * tweak * Fixed bug in L1TStub::isTilted function * Update L1TrackNtupleMaker_cfg.py Removed unnecessary line * Update L1FPGATrackProducer.cc Fix incorrect tiltedBarrel variable in endcap rebase and scram b code-format ran formatter tool 2 tweak Update chi2 tq bins (#165) * change binning method used by track quality * clean TrackQuality class to only create features used by default classifier * ran scram b -j8 clang-format Added tilted and endcap module ring no. to L1TStub (#166) * Added tilted and endcap module ring no. to L1TStub * auto formatting Fix stub order bug (#164) * fix to stub order bug * fix to stub order bug * Updated to one::EDAnalyzer * ran scram b code format * Fixed bug for combined modules Update MatchCalculator.cc Added comment. rebase git conflict resolution rebase git conflict resolution rebase git conflict resolution Remove obsolete FWCore functions (#168) Updated data/ files tweak Reduce L1 tracking CPU (#172) * Reduce CPU use * Reduce CPU * Reduce CPU * Added track quality plots * updated geom * Trivial variable renames * Moved RunTime call to constructor to save CPU * Removed debug calcs from VarBase::calculate * Optimised a bit more VarBase::calculate * optimise CPU further * auto format Update L1TrackNtupleMaker.cc Restored consumes<TrackingVertex>. Not required, but keeps CPU expensive loading of TrackingVertexCollection where it was to make CPU comparisons easier. Removed CI .yml files & data/ directory to allow PR to central CMSSW
cramonal
pushed a commit
to cramonal/cmssw
that referenced
this pull request
Nov 14, 2022
Include commit from fw_synch_210611 (cms-sw#86) * Fixes to remove unused TPROJ memory and fix problem with VMR LUT in L6 * apply code-formats and code-checks Co-authored-by: Anders <[email protected]> Update Settings.h (cms-sw#89) TE truncation reduced from 108 to 107, as requested in cms-L1TK#85 Update geometry and MC files (cms-sw#91) L1 tk dev 12 0 0 pre4 hph (cms-sw#94) * First Commit * Code Format * Fix Typo * Naming Rule * Chris' 2nd Comment Co-authored-by: Jack Li <[email protected]> Reduced configuration (cms-sw#87) * Modified code to support a reduced config (the summer chain) * Updates from running code checker. * Reverted to standard configuration options. * Reverted to standard configuration options. * Settings used to make TV for event 1912 * Reverted to default settings for PR. * Made some of the TV changes in issue 85, and created output TVs 2021-08-04-TTbar-SimpleFWHarmonization. * Clarified comments * Include commit from fw_synch_210611 (cms-sw#86) * Fixes to remove unused TPROJ memory and fix problem with VMR LUT in L6 * apply code-formats and code-checks Co-authored-by: Anders <[email protected]> * Returning to standard config. * Returning to standard config. * Returning to standard config. * Update geometry and MC files (cms-sw#91) * Included reduced variable in non-reduced setups for consistency. * Updated settings to match default configuration rather than HLS compatibility * Added comment about reduced config files Co-authored-by: Tova Holmes <[email protected]> Co-authored-by: Louise Skinnari <[email protected]> Co-authored-by: Anders <[email protected]> Co-authored-by: Ian Tomalin <[email protected]> Revert "L1 tk dev 12 0 0 pre4 hph (cms-sw#94)" (cms-sw#95) This reverts commit 3b2f139. fix getPhiRes function (cms-sw#97) New KF (hand merged with L1TK-dev-12_0_0_pre4) (cms-sw#88) * initial commit. * renamed KFout producer to TT producer * KFout producer and analyzer added. Producer is so far only a skeleton. * small includings fix. * quick TTTypes fix * comments for ian * initial commit. * renamed KFout producer to TT producer * KFout producer and analyzer added. Producer is so far only a skeleton. * small includings fix. * quick TTTypes fix * comments for ian * small script modifications * little ntuple maker mod. * readding fake fit config interface. * track tigger association added, not in the best way. * tttrack associator added as it should be. * option to use TTStubAssMap to associate TTTracks with TPs removed and output module cleaned up. * Added Hybrid_NewKF * Added comment * Update L1TrackNtupleMaker_cfg.py fix typo made by Ian * added tmtt costumization and fakefit option to tracklet config * data format fix * README filled and Configuration.StandardSequences.L1TrackTrigger_cff removed from run scripts. * associateFinal added to StubAssociation. * Update README.md English corrections * minor changes in various comments. * KF 7 layer tracking debugged and defaulted. * turned supported geometry white list into a black list. * Cbrown kfout (cms-sw#93) * Initial Commit for Kfout emulator * with ttTrackRefMap back in * Correct link structure and eta routing * No more print statements * Remove print statements * Merge changes in kfout producer * Thomas' comments #1 * Thomas' comments cms-sw#2 * Change dphi/dz LUT scaling to num of bits * Fix bug to phi sector correction * sync with FW fix * Commit of distribution server for clock accuracy * Fix to undefined operation on numLinkTracks * Fix to numLinkTracks cms-sw#2 Co-authored-by: Ian Tomalin <[email protected]> Co-authored-by: Chriisbrown <[email protected]> fix of KFin EnableTruncation option. (cms-sw#99) * quick fix of KFin EnableTruncation option. * both, enable and disabel truncation fixed. Fix to KF out for multiple KF workers (cms-sw#100) code-format, llvm-ccdb and clang-tidy (cms-sw#103) Fixed clang errors (cms-sw#104) several bug fixes. (cms-sw#108) * bug fixes. * code format * GlobalTag update. * forgot a bug fix in AnalyzerDemonstrator. add number of TTCluster to DTC analzyer end job summary (cms-sw#109) * count of TTCluster added to endjob summary printout. * rebase to L1TK-dev-12_0_0_pre4 and code format. Added git CI (cms-sw#106) * Added git CI * Run CI on PR to any branch * Make L1TRKALGO configurable * tweak * Added script to skim MC datasets for git CI * Remove L1TRKALGO option * Gave CI more sensible name Update github_CI.yml temporary debug check Memory cleanup (cms-sw#98) * Cleanup of writing leading 0x in memories * Cleanup of obsolote comment * Change order of input links to match VMRouter expectation * Add support for debugging * Remove one pipelining step to match HLS * Determine the PS vs 2S in disks same way as we do in HLS * Some cleanup * Correction to LUT code * Comment out printout * Ran scram build code-format * Update comment about IR steps * Cleanup of obsolote comment * Remove one pipelining step to match HLS * Determine the PS vs 2S in disks same way as we do in HLS * Correction to LUT code * Ran scram build code-format phiprojder bug fix (cms-sw#116) Channel Assignment TrackBuilder output Tracks + Stubs and InputRouter input Stubs (cms-sw#110) * track builder channel upgraded to assign stubs to channel. * code format * readded missing pieces. * renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping * name change in L1Trigger/TrackFindingTracklet/python/ProducerKF_cff.py * bug fix * name change of config parameter * code-format * namespace change and consitency check added. * addressing ians comments * addressing ians comments TP_minPt and binning fix (cms-sw#118) Updated VMR maxstep to 107 (originally 108) to match firmware (cms-sw#119) Minor improvements (cms-sw#120) * Minor improvements * Added comments Dropped MC to 104 iterations (cms-sw#123) - Full agreement with HLS Fixing integer range check in FPGAWord. (cms-sw#125) * fixing integer range check in FPGAWord. * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Slight rewerite to use <= instead < and not do subtracktion * Fix < to <= to avoid overflow by one Co-authored-by: Brent R. Yates <[email protected]> Co-authored-by: Anders <[email protected]> Fix KF Track Parameter Digitization (cms-sw#127) * Fix KF Track Parameter Digitization * Add comments to Track.h summer chain demonstrator (cms-sw#111) * track builder channel upgraded to assign stubs to channel. * renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping * ProducerIRin and ProducerTBout added, Demonstrator configured by default to use them. * rebase with tschuh_TrackBuilder and code format * StreamsStub added as EDProduct of L1FPGATrackProducer * code format. * convert only finally accepted Tracklets to StreamsStub. * undo last commit, adding trackword ed product and adding gaps to stubs and tracks to get clock accurate emulation. * swap bugfix. * rebased and name change of TrackBuilderChannel adopted. * fixing rebase errors. * fixing more rebase errors. * fixing even more rebase errors. * first comments from Ian. * code format * second comments from Ian. * code format * Ians third comments. * Ians 4th comments. * small merge error fix * Added comment * Refine comment * miniscule comment change Co-authored-by: Ian Tomalin <[email protected]> Fixed comparisons to avoid overflow. (cms-sw#128) MP HLS agreement fixes (cms-sw#126) * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Fixes to get agreement with HLS code * fixing integer range check in FPGAWord. * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Slight rewerite to use <= instead < and not do subtracktion Co-authored-by: Brent R. Yates <[email protected]> Co-authored-by: Thomas Schuh <[email protected]> Update Settings.h (cms-sw#130) Fix "storeTrackBuilderOutput_" typo Update Setup.cc (cms-sw#129) Change trackerDTC::Setup to tt::Setup . (Bug fix) Update LayerEncoding.h (cms-sw#131) * Update LayerEncoding.h Add function to access layer corresponding to given DTC channel. (Needed by L1Trk Future CMSSW code). * Update LayerEncoding.h response to comment + fix to previous commit * Update LayerEncoding.cc Initialize data member numDTCsPerRegion_ * Update LayerEncoding.h added comment * Update LayerEncoding.h clarified comment Test vector fixes (cms-sw#132) * Made eventProcessor a member of the producer. * Output TC tables in the reduced config. MP cleanup 220208 + MC fix (cms-sw#133) * fixing integer range check in FPGAWord. * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Slight rewerite to use <= instead < and not do subtracktion * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Some updates to MP to converge with HLS code * Further clenup of the MP code * More cleanup -removal of hardcoded numbers * Further cleanup * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * fixing integer range check in FPGAWord. * Fixing `zmatchcut_` for L1 and L2 * Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows * Slight rewerite to use <= instead < and not do subtracktion * Some updates to MP to converge with HLS code * Further clenup of the MP code * More cleanup -removal of hardcoded numbers * Further cleanup * Fixes to the MC to allow full agreement with HLS * Added a comment header and pipeline description * Added comment about MC iterations Co-authored-by: Thomas Schuh <[email protected]> Co-authored-by: Anders <[email protected]> customize L1FPGATrackProducer (cms-sw#112) * track builder channel upgraded to assign stubs to channel. * renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping * StreamsStub added as EDProduct of L1FPGATrackProducer * code format. * convert only finally accepted Tracklets to StreamsStub. * undo last commit, adding trackword ed product and adding gaps to stubs and tracks to get clock accurate emulation. * swap bugfix. * rebased and name change of TrackBuilderChannel adopted. * fixing rebase errors. * fixing more rebase errors. * fixing even more rebase errors. * track builder channel upgraded to assign stubs to channel. * renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping * StreamsStub added as EDProduct of L1FPGATrackProducer * rebased and name change of TrackBuilderChannel adopted. * criteria to build track updated, TBout works now for all seed types. * StreamsStub added as EDProduct of L1FPGATrackProducer * use customize function to manipulate L1FPGATrackProducer configuration * rebase to tschuh_SummerChain, customize updated to set EmulateTB, demonstrator counts now the amount of passed events. * initial counter values fixed. * rebase and reduce config customize function extended * fixing merge errors. * Ians first comments. * rebase and Ians secodn comments. * Update ChannelAssignment_cfi.py * Ians third comments. * Ians fourth comments. Co-authored-by: Ian Tomalin <[email protected]> Update Customize_cff.py (cms-sw#135) TBout analyzer (cms-sw#114) * Reviewed. * one merge error fixed, but a problem remains * fixed second error. * Update AnalyzerTBout.cc Co-authored-by: Ian Tomalin <[email protected]> Fix d0 bias (cms-sw#124) * Fix d0 bias * Documented KF maths and variables Ian tidy up (cms-sw#137) * Added function to convert ATCA slot to DTC name * Moved dtcname to Settings.h and put underscore at end of settings * Declared functions const if dont change data members * Added comments to clarify params overridden by python cfg * Added comment * Removed duplicate function TCNAme disable truncation for displaced tracking (cms-sw#142) DTC phi range hard-wired constants removed (cms-sw#141) * Added function to get num ATCA slots * Added comment * Automatically calc DTC phi ranges * Improved comments * Added comment * Simplified phi offset calc * Fixed missing half-sector rotation bug * Added comments * Changed dtcphirange.txt to numbers instead of C++ code Displaced tracking phi fix (cms-sw#147) * usephiapprox on modify NtupleMaker cfg for grid jobs * added displaced terms to phi calculation in TrackletCalculatorDisplaced * reverting changes unrelated to phi correction Jack hph (cms-sw#146) * First Commit * Code Format * Fix Typo * Naming Rule * Chris' 2nd Comment * Fixing Bug * Ian's 1st Comments * Ian's 2nd Comment: Remove SensorModule Class * Ian's 3rd comment: Get rid of magic numbers * Ian's 4th Comment: Add more clarification * Code-check Co-authored-by: Jack Li <[email protected]> Adding new features to ntuplemaker (cms-sw#148) Co-authored-by: Jack Li <[email protected]> Update StubAssociation.cc (cms-sw#145) as requested a separate PR. Update github_CI.yml Fixed incorrect comment KFin emulator (cms-sw#143) * initial commit. * move ProducerTBout.cc from test to plugins * KFin fully debugged. * Producer TBout added to NTupleMaker * chriss change to KFout * Louises first comments. * fixing rebase errors. * KF reintegrated, stub residuals are not bit accurate yet. * code format. * added 1k ttbar@0PU events for internal kf maths tuning. * Track builder r residual debug and KF digi function corrected. * bug in z residual base fixed. * Ians first comments. * Ians secodn comments. * recalculate z ressid from TTStubRefs, use TTStubRefs for seed stubs instead of fake stubs. * Ians third comment. * fixed comments TTDTC::Frames -> tt::Frames * old stub uncertainty caclulation re-enabled. * Ians 4th comments. * code-checks. * tilted stub z uncertainty fixed. not yet debugged against f/w. * set max layers a kff adds to a track to 7 as we did in the past, no clue why it is 4 again ... * agrrement with f/w, ready to merge. Fix rare crash in KF (cms-sw#151) * Fix rare crash in KF * Fixed line break Removed obsolete parameter. (cms-sw#152) quick ntuple fix (cms-sw#153) * L1TrackNtupleMaker_cfg.py updated reduced workflow. * further cleaning. Update L1TrackNtupleMaker_cfg.py fixed typo Removal of dependencies of ChannelAssignement (cms-sw#144) * This code includes a new implementation of the Track and Stub Streams generation. The old code is still running in parallel. * Remove code for old calculation of stream data - keeping the debug print out in this commit * Remove debud printout * added numSeedTypes function * rebased Anders branch * rebased Anders branch * tidied up Anders branch * tidied up Anders branch * ran scram b code-format * Thomas PR review comments * max num of proj layers added to channel assignment. * merge with Thomas commit Co-authored-by: Ian Tomalin <[email protected]> Co-authored-by: Thomas Schuh <[email protected]> Ran second auto formatter tool (cms-sw#154) * Ran second auto formatter tool * tweak Update ProducerSetup_cfi.py correct comment in code Update Customize_cff.py add comment in code Tracklet Processor Displaced (cms-sw#159) * Tracklet Processor Displaced * code-format * code-format again * remove unnecessary comments and add explanation for header file * implement more comments * remove more magic numbers Update track quality chi2 bins (cms-sw#161) * update chi2 bins * change chi2 variables to be per dof Ian L1TStub bug fix (cms-sw#160) * Ran second auto formatter tool * tweak * Fixed bug in L1TStub::isTilted function * Update L1TrackNtupleMaker_cfg.py Removed unnecessary line * Update L1FPGATrackProducer.cc Fix incorrect tiltedBarrel variable in endcap rebase and scram b code-format ran formatter tool 2 tweak Update chi2 tq bins (cms-sw#165) * change binning method used by track quality * clean TrackQuality class to only create features used by default classifier * ran scram b -j8 clang-format Added tilted and endcap module ring no. to L1TStub (cms-sw#166) * Added tilted and endcap module ring no. to L1TStub * auto formatting Fix stub order bug (cms-sw#164) * fix to stub order bug * fix to stub order bug * Updated to one::EDAnalyzer * ran scram b code format * Fixed bug for combined modules Update MatchCalculator.cc Added comment. rebase git conflict resolution rebase git conflict resolution rebase git conflict resolution Remove obsolete FWCore functions (cms-sw#168) Updated data/ files tweak Reduce L1 tracking CPU (cms-sw#172) * Reduce CPU use * Reduce CPU * Reduce CPU * Added track quality plots * updated geom * Trivial variable renames * Moved RunTime call to constructor to save CPU * Removed debug calcs from VarBase::calculate * Optimised a bit more VarBase::calculate * optimise CPU further * auto format Update L1TrackNtupleMaker.cc Restored consumes<TrackingVertex>. Not required, but keeps CPU expensive loading of TrackingVertexCollection where it was to make CPU comparisons easier. Removed CI .yml files & data/ directory to allow PR to central CMSSW
yulunmiao
pushed a commit
to yulunmiao/cmssw
that referenced
this pull request
Oct 9, 2024
Code format HGCalMappingESSourceTester.cc Removing unused includes and delarations after PR comments Correction: missing :: for namespace Fix code style indentation record descriptions Re-introducing headers.h file needed for serialization classes remove data and change locations to cms-data folder moving to single record as all conds produced have the same IOV re-introducing 1 record per payload, addressing additional code comments moving to printf, removing unused product, and message logger code checks remove unused iomanip adding digi SoAs update collection names moving emulators to SimCalorimetry/HGCalSimAlgos, adapting paths moving digi soa filler to alpaka and adding extra tools some progress with soafiller updating fixing but in module es producer (assignment of capture block index instead of capture block) add dense index map for HGCalElectronicsId add getMaxDataSize & getMaxERxSize functions fix getDenseIndex bug; add typcode map to ModuleIndexer (to retrieve module dense index offset); use regexp for type code add getFedAndModuleIndex; rename getDenseIndex -> getIndexForModule(Data) for elecID add calibrations Alpaka ESProducer rename ES_HGCal*Parameter.cc -> HGCal*ParameterHostCollection.cc for clarity int -> uint32_t; uncomment debugging print out clean add HGCal configuration ESProducers + record + tester rename ES_HGCal*Parameter.cc -> HGCal*ParameterHostCollection.cc for clarity rename HGCal*ParameterHostCollection.cc -> HGCal*ParameterDeviceCollection.cc for clarity rename 'HGCal.*(Device|Host)Collection -> (Device|Host)' for readability; move calib SoAs to CondFormats/HGCalObjects/; move TestHGCalRecHitESProducers to test rename 'HGCal.*(Device|Host)Collection -> HGCal.*(Device|Host)' for readability add HGCalRecHit add DIGI2RECO calibration algorithms (see https://gitlab.cern.ch/hgcal-dpg/hgcal-comm/-/merge_requests/3)[C; remove detId/elecId from SoAs (should be redundant since common indexer); add HGCROCChannelDataFrame<HGCalDetId> to classes_def.xml Move HGCalRawDataDefinitions.h. [WIP] Refactor unpacker. parse arrays of gain-dependent calibration parameters in eRx-blocks add missing Noise attribute updating usage of Rcd fixing cfg files Convert ECON-D payload to 32b words. [Unpacker] rebase the unpacker on denseIdx and SoA digis Update unpacker code. SoA format of HGCal ECON-D header Unpack header information to HGCalECONDInfoSoA; Add in quality checks for ECON-D remove unused add typecode regexp; pass typecode to modIndexer_.processNewModule update ESProducers update record fix ESInputTags prefix filename with T_EventSetup_ add HGCalConfiguration & HGCalConfigurationESProducer Update and rename HGCalRecHitProducer.cc to HGCalRecHitProducers.cc fill HGCal config structs for unpacker (header marks, charMode) update calibration kernels read HGCal FED & ECON-D configuration from JSON Update unpacker to use HGCalConfiguration structure make manual overrides truly optional fix compilation issue due to initialization of const gain Change to LogDebug adding dense index info producer adding hgcalmapping customise fix misunderstanding in max data size expected from indexer Implement TH2Poly in DQM based on 14e856f Update HGCalConfigurationESProducer.cc update unpacker and HGCalConfiguration Add definitions of flags in digi SOA update the other part to most recent commit Add flags for passthrough ECON-Ds Debug: loop through every denseIdx Fix the number of channel in eRx;Add default flag for digi, representing digi not read in raw data fully read config parameters from JSONs for config SoA; add sanity checks; add HGCalMappingModuleIndexer::getNFED; rename getFedAndModuleIndex -> getIndexForFedAndModule; clean code; ... rename macro silence debugging message in ESProducers silence cout add HGCalMappingModuleIndexer::getMaxModuleSize(fedid) typo; SystemTestEventFilters/data -> Configuration/data bugfix in the cm Sum fixing dense index issue Update comment in HGCalMappingParameterSoA.h Some additional fixes (cms-sw#132) - remove_if was missing a call to std::vector::erase to effectively remove unused entries - typecodemap was missing a reset with the final indices - usage of command line options was missing in module map tester - do not use moduleLUT in DenseIndexInfoESProducer!! it has the full dimensions before trimming to the actual number of ECON-Ds in a FED Add parsing function for econd flag; renaming HGCalECONDInfo to HGCalECONDPacketInfo Add irot to module mapper (cms-sw#134) * - remove_if was missing a call to std::vector::erase to effectively remove unused entries - typecodemap was missing a reset with the final indices - usage of command line options was missing in module map tester * do not use moduleLUT in DenseIndexInfoESProducer!! * Adding optional irot to module mapper file - If existing it will be put in the module info SoA - othwerwise a default irot=0 (baseline is used) Suppress "unused variable" warning: remove CellIndexer in HGCalDigiSoaFiller.cc apply code formats (cms-sw#135) Apply suggestions from code review Apply easy suggestions by Matti. (Looking into other comment & suggestions.) Co-authored-by: Matti Kortelainen <[email protected]> 'const json' to fix compilation issue for Matti's suggestion gain index should be taken as is, not subtracted by 1 make use of valid at rechit level / set rechit valids fill rec hitflags update kernel after closure Implement suggestions for CMSSW_14_1_X PR cms-sw#45665 (cms-sw#137) * Implement TH2Poly in DQM Services for HGCal DQM * Apply changes from code quality checks * Add a patch based on makortel's comments * enum -> namespace + constexpr uint{8,16,32}_t * Matti suggestion: remove '_t' postfix from HGCalFEDReadoutSequence_t, HGCalROCConfig_t, HGCalECONDConfig_t, HGCalFedConfig_t structs * Matti suggestions & code checks: remove redundant comments; silence debugging cout or use MessageLogger; move includes; remove trailing '_' from function arguments * Matti suggestion: reuse typecodeMap_.find() to avoid searching twice (TODO: throw exception if not found?) * Matti suggestion: use SET_PORTABLEHOSTCOLLECTION_READ_RULES; add ClassVersion+checksum * Matti suggestion: iRecord.getRecord<...>. -> iRecord. * Matti suggestion: iRecord.getRecord<...>. -> iRecord.; rm redundant includes & couts; pass reference to fill_SoA_column to avoid copy * Matti suggestions: use SET_PORTABLEHOSTCOLLECTION_READ_RULES for HGCalRecHitHost; Remove deprecated HGCalFlaggedECONDInfo* & comments; * Matti suggestion: throw exception if type code not found; replace for-loop with std::accumulate * Matti suggestion: remove TestObjects * Matti suggestions: remove config as member data and produce unique_ptr instead of shared_ptr; NULL → nullptr; initialize optional override; memcp -> std::copy * Matti suggestions: use file in path * removing soafiller and updating buildfile (cms-sw#139) * address comments on HGCalRecHitCalibrationAlgorithms.dev.cc * irot as uint8_t instead of char * restore DQM without TH2Poly * apply code formats --------- Co-authored-by: ywkao <[email protected]> Co-authored-by: Pedro <[email protected]> restore release base DQM classes (cms-sw#140) move to chrono calls instead of struct inside namespace (cms-sw#141) address comments (cms-sw#142) update include (cms-sw#143) remove ECON-D tests as they'll need to be re-written in a different form (cms-sw#144) Declare HGCalRecHitCalibrationAlgorithms::calibrate as const method (cms-sw#145) * remove ECON-D tests as they'll need to be re-written in a different form * enable const patching unpacker for padding of capture blocks within FED move check of padding to start of capture block Fix the throw, so the processing won't stop at the first event with error Update HGCalRecHitCalibrationAlgorithms.dev.cc CM sum -> 0.5*CM sum Change the throws to specific returns Optimize the producer Debugging the padding of eRx subpackets roll back (cms-sw#149) apply code checks and remove dqm
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.