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.

Sign up for GitHub

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

Jump to bottom

Pull request #5430 with merge conflicts resolved #5608

Merged
merged 9 commits into from
Sep 29, 2014
Merged

Pull request #5430 with merge conflicts resolved #5608

merged 9 commits into from
Sep 29, 2014

Conversation

mark-grimes
Copy link

See #5430.

Suchandra and others added 9 commits August 18, 2014 12:41
Latest code before integrating within the framework
b0c5054
Latest code before integrating within the framework
3121e63
update DigiValidationTest_cfg.py
06cab25
First version of the PhaseII Tracker Digitizer with added supoort for…
5b01ebb 
… Pixel, PS and SS modules
removing unwanted files ....
ef121ab
updating the package to adopt to the cganged made by @wmtford in the …
96e3060 
…pixel digitiser
removed unwanted configuration file
c41e506
DigiValidation updated to have complete migration to use TrackerTopology
3f42c66
Merge remote-tracking branch 'pr/5430' into merge5430
339b0b2 
Conflicts:
	SimTracker/SiPhase2Digitizer/plugins/SiPhase2Digitizer.cc
	SimTracker/SiPhase2Digitizer/plugins/SiPhase2Digitizer.h
	SimTracker/SiPhase2Digitizer/plugins/SiPhase2DigitizerAlgorithm.cc
	SimTracker/SiPhase2Digitizer/plugins/SiPhase2DigitizerAlgorithm.h
@mark-grimes mark-grimes mentioned this pull request Sep 29, 2014
Merged
@cmsbuild cmsbuild added this to the Next CMSSW_6_2_X_SLHC milestone Sep 29, 2014
@cmsbuild
Copy link
Contributor

A new Pull Request was created by @mark-grimes (Mark Grimes) for CMSSW_6_2_X_SLHC.

Pull request #5430 with merge conflicts resolved

It involves the following packages:

SimTracker/SiPhase2Digitizer

The following packages do not have a category, yet:

SimTracker/SiPhase2Digitizer

@cmsbuild, @nclopezo, @ktf can you please review it and eventually sign? Thanks.
@makortel, @GiacomoSguazzoni, @rovere, @VinInn, @cerati, @threus, @venturia this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@fratnikov, @mark-grimes you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@mark-grimes
Copy link
Author

merge

cmsbuild added a commit that referenced this pull request Sep 29, 2014
@cmsbuild
Merge pull request #5608 from mark-grimes/merge5430
cc13de5 
Pull request #5430 with merge conflicts resolved
@cmsbuild cmsbuild merged commit cc13de5 into cms-sw:CMSSW_6_2_X_SLHC Sep 29, 2014
@mark-grimes mark-grimes deleted the merge5430 branch January 23, 2015 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
comparison-pending new-package-pending orp-pending pending-signatures tests-pending
Projects
None yet
Milestone
Next CMSSW_6_2_X_SLHC
Development

Successfully merging this pull request may close these issues.
2 participants
@mark-grimes @cmsbuild