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

Three otherwise unrelated framework changes needed for the new mixing fe... #36

Merged
merged 1 commit into from Jul 6, 2013

Conversation

ktf
Copy link
Contributor

@ktf ktf commented Jul 4, 2013

...ature for premixed pileup stored as raw data..

… feature for premixed pileup stored as raw data..

1) Add a new function, setRunAndLumiNumber, to class EventPrincipal.

2) Remove an unused data member, procPset_, from class WorkerParams.

3) The current class "Schedule" does (at least) three different things:
a) Manage the schedule (e.g. paths, end paths, etc.)
b) Manage unscheduled (i.e. on demand) execution of modules
c) Manage the workers, which in turn manage the modules.
Functions b) and c) are removed from "Schedule" and moved to a new class, "WorkerManager".

This tagset has been fully tested. All relvals pass.

--- Tagset history ---
2013-06-13 20:31:50 - Queued by wmtan.
@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 4, 2013

The following categories have been signed by chrjones (a.k.a. @Dr15Jones on GitHub): Core

@cms-git-visualization, @cms-git-core, @cms-git-geometry

ktf added a commit that referenced this pull request Jul 6, 2013
Three otherwise unrelated framework changes needed for the new mixing fe...
@ktf ktf merged commit bbf4b57 into cms-sw:CMSSW_7_0_X Jul 6, 2013
Dr15Jones added a commit to Dr15Jones/cmssw that referenced this pull request Jul 7, 2013
The Schedule class had conflicts since the recent topic cms-sw#36 moved Worker handling
into a WorkerManager class and out of Schedule. This merge reconciles that change
with the change to use an OutputModuleCommunicator class.

Conflicts:
	FWCore/Framework/interface/Schedule.h
	FWCore/Framework/src/Schedule.cc
dildick referenced this pull request in gem-sw/cmssw Sep 26, 2013
MuSimHitOccupancy analyzer; filter for selecting events with SimHits in CSC
jshlee referenced this pull request in jshlee/cmssw Nov 27, 2013
…-of-clustering

Clean up of digitizer and addition of clustering
yetkinyilmaz referenced this pull request in CmsHI/cmssw Dec 23, 2013
nclopezo pushed a commit to nclopezo/cmssw that referenced this pull request May 5, 2014
fix for producing release notes
franzoni pushed a commit to franzoni/cmssw that referenced this pull request May 8, 2014
geonmo pushed a commit to geonmo/cmssw that referenced this pull request Jul 23, 2014
arizzi referenced this pull request in arizzi/cmssw May 27, 2015
Thanks Andrea, I'm merging only now cause I wanted to wait for the branch to be merged in CMSSW.
akalinow pushed a commit to akalinow/cmssw that referenced this pull request Sep 14, 2015
rkunnawa pushed a commit to rkunnawa/cmssw that referenced this pull request Dec 16, 2015
mmarionncern pushed a commit to mmarionncern/cmssw that referenced this pull request May 23, 2016
jbsauvan added a commit to jbsauvan/cmssw that referenced this pull request Aug 23, 2016
danielwinterbottom pushed a commit to danielwinterbottom/cmssw that referenced this pull request Mar 13, 2017
…D-backport-tauID_AC_PR

fix for phitAtEcalEntrance variable
mariadalfonso pushed a commit to mariadalfonso/cmssw that referenced this pull request May 6, 2017
jhgoh pushed a commit to jhgoh/cmssw that referenced this pull request May 17, 2017
makortel pushed a commit to makortel/cmssw that referenced this pull request Apr 3, 2018
Replace `std::cout` with `LogTrace`.
Mark debugging functions as possibly unused.
amartelli pushed a commit to amartelli/cmssw that referenced this pull request Jan 10, 2019
Sam-Harper added a commit to Sam-Harper/cmssw that referenced this pull request Mar 17, 2019
felicepantaleo referenced this pull request in felicepantaleo/cmssw Mar 28, 2019
BrieucF pushed a commit to BrieucF/cmssw that referenced this pull request Jul 15, 2019
aehart added a commit to aehart/cmssw that referenced this pull request Oct 18, 2020
* revert make file for standalone

* fix printout about extended tracking setup

* Replace five of the TETable***** classes with one VMRouterTable. Merge Makefile.inc into Makefile

* Some minor code cleanup and fixes for the displaced tracking

* add missing inlcude of algorithm and fix compiler warning

* Cleanup of code in TCD

* Some more code cleanup

* Remove the used of rproj_ member data - us constants in settings instead

* Remove more unneeded variables

* Remove more unneeded variables

* Remove more unneeded variables

* More code cleanup to remove unneeded variables

* More removal of unnneded variables

* Fix mistake in return type of layer and disk - was double and change to unsigned

* Remove cout that had been left in the code...

* Add virtual destructors

* Revert "Add virtual destructors"

This reverts commit 7e464a1.

* remove virtual destructors except for memory/process base class

* remove ostringstream usage in favor of std::to_string

* change to lowercase function names for imath

* fix include of TH2

* change to use hypot

* change namespace Trklet to trklet

* change getFPGATracklet to getTracklet

* clean up buildfiles

* fix virtual destructors

* Add virtual destructors

* fix destructors

* change destructors to use = default

* remove Cabling::init in favor of initilizing in constructor

* rename init function in DTC

* remove init for globals

* a few pointer initialize to nullptr

* minor changes to memory/process base classes obo PR comments

* change CPUtimer

* Address many missing const for pointers

* More const additions

* More const pointers on return

* fix include

* clean up

* minor pr comments

* various minor pr comments

* Cleanup to return FPGAWord as reference

* some memory cleanup

* some PR comments to fix magic numbers

* move HistImp to internal test/ directory only

* some const and simplification for PR

* add override for derived functions

* make function const

* make more function const

* cleanup includes

* remove assert

* Delete the imath TC in Globals destructor

* Use std::unique_ptr to delete the imath TC

* Remove the foundTrack method

* clean up speed of light and triplet bend cut

* make fpgatrack in tracklet unique_ptr

* add support for cms::exception

* change bfield to more accurate value

* change bfield to more accurate value

* push_back -> emplace_back

* Remove some unused code

* Remove unused InverseTable

* update make clean to really make clean

* minor pr comment

* Remove use of round_int and use lround instead

* fix some magic numbers

* rcrit fix

* some assert -> exception

* Remove some unused code in the L1TStub class

* Remove unused code code for MS

* minor pr

* move Write*icc and python config fixes

* further clean up obo PR

* nifty code simplications obo PR reviewer

* remove mutable in Settings.h

* various cleanup

* minor code simplification

* cleanup of exception throwing

* Remove the mutable in Settings.h

* fix some magic numbers in IMATH*h

* Remove some unused code in the Tracklet Event processor

* make nsectors a constexpr

* rename some functions obo PR request

* fix some magic numbers

* switch to unordered set/map

* some cleanup

* Cleanup in the Stub class

* remove use of pair<Stub*, L1TStub*> and just use Stub*. L1TStub* is now member data in Stub

* started added comments about file usage

* change char to bitset

* small PR cleanup

* actually finish bitset stuff

* make some returns const&

* sprintf -> snprintf

* various edits from PR review

* Introduce new constant deltarzfract_ for calculating dzmax and drmax

* More cleanup of the Track and TrackPars class

* Cleanup in Cabling and slhcevent

* More code cleanup

* Cleanup of Sector and Globals

* Attempts at addressing more of the comments

* clean up imath functions (get_sth() -> sth()), make accessors const, range-based loops

* capitalize all class names in imath obo cms code rules

* rename slhcevent

* cleanup for running in cmssw

* edproducer updates + set magfield

* changes for geometry constants

* cleanup hybridfit for latest tmtt code

* switch to edm::stream::EDProducer

* add protection for missing triplet tables

* Fix array size in FitTrack and remove unused data in Settings

* turn on hybrid

* Mograte away from pair<Stub*,L1TStub*> to plain Stub*

* Fix compilation errors for hybrid

* Fix compilation errors for hybrid

* Fix compilation errors for hybrid

* Fix compilation errors for hybrid

* Fix compilation errors for hybrid

* Fix compilation errors for hybrid

* set bfield for tmtt

* Removed code to delete Kalman Fitter

* clean up imath numbers:

* fix comments

* clean up module constants

* fix hybrid

* remove debug printout

* fixes for hybrid

* fixes for hybrid

* remove data files, these will from now on instead be accessed from separate repository

* Fix to typo introduced when migrating away from pair<Stub*,L1TStub*>

* Try new B-field initialization

* fix stub comparison

* cleanup magfield usage

* applying scram build code-format checks

* fix override notation for destructors plus some checks using empty() instead

* clean up to nullptrs

* loads of const & changes

* more range based loops

* clang formats again

* Revert "clang formats again"

This reverts commit e3bb41f.

* Revert "more range based loops"

This reverts commit 4058aab.

* Revert "loads of const & changes"

This reverts commit a0ee0e3.

* more range based loops

* more range based loops (based on auto clang tiny

* fix more hardcoded 5/6 in favor of N_LAYER/N_DISK

* clean up lots of assert(0) -> cms::exception

* bugfix

* clang-tidy for test/ dir

* clang tidy on interface/

* clang tidy src/ (mostly changes to range based loops)

* minor fix

* clang tidy on plugins/

* code format checks, again...

* update python config

* turn on HYBRID

* fix imath overrides

* minor codeformat complaint

* Delete tmtt objects in Global. Separate implementation of Globals in separate .cc file. Put imath code in trklet namespace

* move initialization in imathglobal plus remove some unused ofstream

* remove phirange functions

* switch to reducerange

* change to pass Settings as const reference instead of const pointer

* more fixing of magic numbers

* Fix logic error in table building for disks

* lots of clean up of magic numbers

* fix hybrid

* fix comment

* code formats

* further constants cleanup in settings

* cleanup standalone producer

* map -> unordered_map

* map -> unordered_map

* apply code formats again...

* cleanup imath

* more fix magic numbers

* pushed to quickly... fix...

* switch to c++17 and use clamp

* make cabling unique_ptr

* fix magic numbers fixing + unique_ptr

* Use unique_ptr for sectors and Globals

* Use unique_ptr for the tmtt::Settings

* fix cmssw compilation

* Add include of Settings.h to ensure USEHYBRID set:

* ls test

* fix..

* fix debug statements

* code formats

* turn back on hybrid

* fix remove code

* fix ntuplemaker py config for extended tracking

* Fixes to the displaced tracking

* Few fixes for combined modules

* Remove fine phi cut in MatchProcessor, some other cleanup, add comments

* Incorporate changes from VMRouter_Cleanup branch in gitlab emulator

* restore change in ntuplemaker

* fix to allow running displaced tracking independent on directory

* remove 'passes' checks for goodTrackPars in TCBase

* Fix mistake in TCBase

* Removed assert that does not really do anything useful

* Fix problem with D1D2L2 triplet engine - retrieved wrong lookupbits

* bug fix of isFlipped flag flip introduced during CMSSW integration

* Fix to pick up the stubs on triplet seeds in the chi^2 fit

* Fix sign in front of d0, for Phider

This fix seems to keep the resolution in sensible ranges.

* propagate reviewer changes

* address reviewer comments

* ensure phi0 to return between -pi and +pi

* Some cleanup in writing of LUTs. Now all files use .tab extension and write to directory specificy by settigs::tablePath

* Fix a few bugs for the combined modules - truncations used to fail

* Bug Fix in Stub.cc

There is a problem with the rapprox implementation.
Values for Stub->rapprox(); and Stub->r(); are 70cms apart for Disk 2S.

The bug fix above will prevent this from happening.

* Fixed hexFormat().

* Enable printing of finebin tables for VMRouter

* Improved fix of VMRouterTable writing

* Fixed duplicate event issue, and added VMTableInner & VMTableOuter LUT printouts

* Added appropriate consts to method arguments

* Many modifications that affect the combined modules performance

* Fixed a few bugs.

* updated truncation numbers

* Revert "Fixed TP compilation errors."

* Revert "L1 tk dev 11 1 0 pre8 vm router table fix"

* Revert "Revert "Fixed TP compilation errors.""

* Readded changes to enable printout of VMRouter LUTs

* Adjust bitwidths of z/r bits in VMStubsTEInner to match HLS and TWiki

* Fixed several formatting issues that happened with the merge

* Style adjustments to VMRouterTable

* Fixed typo in VMRouterTable

Co-authored-by: Louise Skinnari <louise.skinnari@cern.ch>
Co-authored-by: Anders Ryd <ar322@cornell.edu>
Co-authored-by: Anders <aryd@cern.ch>
Co-authored-by: = <=>
Co-authored-by: Abhijith Gandrakota <g.abhijith@gmail.com>
Co-authored-by: Andrew Hart <ahart@cern.ch>
Co-authored-by: Cara Pesciotta <pesciotta.c@husky.neu.edu>
tomalin pushed a commit to tomalin/cmssw that referenced this pull request Jan 5, 2021
* revert make file for standalone

* fix printout about extended tracking setup

* Replace five of the TETable***** classes with one VMRouterTable. Merge Makefile.inc into Makefile

* Some minor code cleanup and fixes for the displaced tracking

* add missing inlcude of algorithm and fix compiler warning

* Cleanup of code in TCD

* Some more code cleanup

* Remove the used of rproj_ member data - us constants in settings instead

* Remove more unneeded variables

* Remove more unneeded variables

* Remove more unneeded variables

* More code cleanup to remove unneeded variables

* More removal of unnneded variables

* Fix mistake in return type of layer and disk - was double and change to unsigned

* Remove cout that had been left in the code...

* Add virtual destructors

* Revert "Add virtual destructors"

This reverts commit 7e464a1.

* remove virtual destructors except for memory/process base class

* remove ostringstream usage in favor of std::to_string

* change to lowercase function names for imath

* fix include of TH2

* change to use hypot

* change namespace Trklet to trklet

* change getFPGATracklet to getTracklet

* clean up buildfiles

* fix virtual destructors

* Add virtual destructors

* fix destructors

* change destructors to use = default

* remove Cabling::init in favor of initilizing in constructor

* rename init function in DTC

* remove init for globals

* a few pointer initialize to nullptr

* minor changes to memory/process base classes obo PR comments

* change CPUtimer

* Address many missing const for pointers

* More const additions

* More const pointers on return

* fix include

* clean up

* minor pr comments

* various minor pr comments

* Cleanup to return FPGAWord as reference

* some memory cleanup

* some PR comments to fix magic numbers

* move HistImp to internal test/ directory only

* some const and simplification for PR

* add override for derived functions

* make function const

* make more function const

* cleanup includes

* remove assert

* Delete the imath TC in Globals destructor

* Use std::unique_ptr to delete the imath TC

* Remove the foundTrack method

* clean up speed of light and triplet bend cut

* make fpgatrack in tracklet unique_ptr

* add support for cms::exception

* change bfield to more accurate value

* change bfield to more accurate value

* push_back -> emplace_back

* Remove some unused code

* Remove unused InverseTable

* update make clean to really make clean

* minor pr comment

* Remove use of round_int and use lround instead

* fix some magic numbers

* rcrit fix

* some assert -> exception

* Remove some unused code in the L1TStub class

* Remove unused code code for MS

* minor pr

* move Write*icc and python config fixes

* further clean up obo PR

* nifty code simplications obo PR reviewer

* remove mutable in Settings.h

* various cleanup

* minor code simplification

* cleanup of exception throwing

* Remove the mutable in Settings.h

* fix some magic numbers in IMATH*h

* Remove some unused code in the Tracklet Event processor

* make nsectors a constexpr

* rename some functions obo PR request

* fix some magic numbers

* switch to unordered set/map

* some cleanup

* Cleanup in the Stub class

* remove use of pair<Stub*, L1TStub*> and just use Stub*. L1TStub* is now member data in Stub

* started added comments about file usage

* change char to bitset

* small PR cleanup

* actually finish bitset stuff

* make some returns const&

* sprintf -> snprintf

* various edits from PR review

* Introduce new constant deltarzfract_ for calculating dzmax and drmax

* More cleanup of the Track and TrackPars class

* Cleanup in Cabling and slhcevent

* More code cleanup

* Cleanup of Sector and Globals

* Attempts at addressing more of the comments

* clean up imath functions (get_sth() -> sth()), make accessors const, range-based loops

* capitalize all class names in imath obo cms code rules

* rename slhcevent

* cleanup for running in cmssw

* edproducer updates + set magfield

* changes for geometry constants

* cleanup hybridfit for latest tmtt code

* switch to edm::stream::EDProducer

* add protection for missing triplet tables

* Fix array size in FitTrack and remove unused data in Settings

* turn on hybrid

* Mograte away from pair<Stub*,L1TStub*> to plain Stub*

* Fix compilation errors for hybrid

* Fix compilation errors for hybrid

* Fix compilation errors for hybrid

* Fix compilation errors for hybrid

* Fix compilation errors for hybrid

* Fix compilation errors for hybrid

* set bfield for tmtt

* Removed code to delete Kalman Fitter

* clean up imath numbers:

* fix comments

* clean up module constants

* fix hybrid

* remove debug printout

* fixes for hybrid

* fixes for hybrid

* remove data files, these will from now on instead be accessed from separate repository

* Fix to typo introduced when migrating away from pair<Stub*,L1TStub*>

* Try new B-field initialization

* fix stub comparison

* cleanup magfield usage

* applying scram build code-format checks

* fix override notation for destructors plus some checks using empty() instead

* clean up to nullptrs

* loads of const & changes

* more range based loops

* clang formats again

* Revert "clang formats again"

This reverts commit e3bb41f.

* Revert "more range based loops"

This reverts commit 4058aab.

* Revert "loads of const & changes"

This reverts commit a0ee0e3.

* more range based loops

* more range based loops (based on auto clang tiny

* fix more hardcoded 5/6 in favor of N_LAYER/N_DISK

* clean up lots of assert(0) -> cms::exception

* bugfix

* clang-tidy for test/ dir

* clang tidy on interface/

* clang tidy src/ (mostly changes to range based loops)

* minor fix

* clang tidy on plugins/

* code format checks, again...

* update python config

* turn on HYBRID

* fix imath overrides

* minor codeformat complaint

* Delete tmtt objects in Global. Separate implementation of Globals in separate .cc file. Put imath code in trklet namespace

* move initialization in imathglobal plus remove some unused ofstream

* remove phirange functions

* switch to reducerange

* change to pass Settings as const reference instead of const pointer

* more fixing of magic numbers

* Fix logic error in table building for disks

* lots of clean up of magic numbers

* fix hybrid

* fix comment

* code formats

* further constants cleanup in settings

* cleanup standalone producer

* map -> unordered_map

* map -> unordered_map

* apply code formats again...

* cleanup imath

* more fix magic numbers

* pushed to quickly... fix...

* switch to c++17 and use clamp

* make cabling unique_ptr

* fix magic numbers fixing + unique_ptr

* Use unique_ptr for sectors and Globals

* Use unique_ptr for the tmtt::Settings

* fix cmssw compilation

* Add include of Settings.h to ensure USEHYBRID set:

* ls test

* fix..

* fix debug statements

* code formats

* turn back on hybrid

* fix remove code

* fix ntuplemaker py config for extended tracking

* Fixes to the displaced tracking

* Few fixes for combined modules

* Remove fine phi cut in MatchProcessor, some other cleanup, add comments

* Incorporate changes from VMRouter_Cleanup branch in gitlab emulator

* restore change in ntuplemaker

* fix to allow running displaced tracking independent on directory

* remove 'passes' checks for goodTrackPars in TCBase

* Fix mistake in TCBase

* Removed assert that does not really do anything useful

* Fix problem with D1D2L2 triplet engine - retrieved wrong lookupbits

* bug fix of isFlipped flag flip introduced during CMSSW integration

* Fix to pick up the stubs on triplet seeds in the chi^2 fit

* Fix sign in front of d0, for Phider

This fix seems to keep the resolution in sensible ranges.

* propagate reviewer changes

* address reviewer comments

* ensure phi0 to return between -pi and +pi

* Some cleanup in writing of LUTs. Now all files use .tab extension and write to directory specificy by settigs::tablePath

* Fix a few bugs for the combined modules - truncations used to fail

* Bug Fix in Stub.cc

There is a problem with the rapprox implementation.
Values for Stub->rapprox(); and Stub->r(); are 70cms apart for Disk 2S.

The bug fix above will prevent this from happening.

* Fixed hexFormat().

* Enable printing of finebin tables for VMRouter

* Improved fix of VMRouterTable writing

* Fixed duplicate event issue, and added VMTableInner & VMTableOuter LUT printouts

* Added appropriate consts to method arguments

* Many modifications that affect the combined modules performance

* Fixed a few bugs.

* updated truncation numbers

* Revert "Fixed TP compilation errors."

* Revert "L1 tk dev 11 1 0 pre8 vm router table fix"

* Revert "Revert "Fixed TP compilation errors.""

* Readded changes to enable printout of VMRouter LUTs

* Adjust bitwidths of z/r bits in VMStubsTEInner to match HLS and TWiki

* Fixed several formatting issues that happened with the merge

* Style adjustments to VMRouterTable

* Fixed typo in VMRouterTable

Co-authored-by: Louise Skinnari <louise.skinnari@cern.ch>
Co-authored-by: Anders Ryd <ar322@cornell.edu>
Co-authored-by: Anders <aryd@cern.ch>
Co-authored-by: = <=>
Co-authored-by: Abhijith Gandrakota <g.abhijith@gmail.com>
Co-authored-by: Andrew Hart <ahart@cern.ch>
Co-authored-by: Cara Pesciotta <pesciotta.c@husky.neu.edu>
franzoni pushed a commit to franzoni/cmssw that referenced this pull request May 3, 2021
Add new readGenParticles setting to default NTUP template
jkiesele pushed a commit to jkiesele/cmssw that referenced this pull request Oct 11, 2022
ywkao pushed a commit to ywkao/cmssw that referenced this pull request Jul 31, 2023
sroychow pushed a commit to erc-asymow/cmssw that referenced this pull request Mar 19, 2024
AuroraPerego added a commit to AuroraPerego/cmssw that referenced this pull request May 3, 2024
AuroraPerego added a commit to AuroraPerego/cmssw that referenced this pull request May 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants