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
[10.0.x] Miscellaneous updates in Alignment PV Validation #21078
Conversation
The code-checks are being triggered in jenkins. |
+code-checks |
A new Pull Request was created by @mmusich (Marco Musich) for master. It involves the following packages: Alignment/CommonAlignment @ghellwig, @arunhep, @cerminar, @cmsbuild, @franzoni, @lpernie can you please review it and eventually sign? Thanks. cms-bot commands are listed here |
please test |
The tests are being triggered in jenkins. |
+1 The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic: |
Comparison job queued. |
Comparison is ready Comparison Summary:
|
"d0Max" : 999999.0, | ||
"dzMin" : -999999.0, | ||
"dzMax" : 999999.0 | ||
}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mmusich did you consider the altenative approach of using the common sequence first and overriding in your config as a second step similar to this:
process.refittingSequence = getSequence(...)
process.HighPurityTrackSelector.pMin = 0.0
...
This would avoid further cluttering of the common method, but I'm also fine with your approach.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ghellwig, that's exactly how it was before (https://github.com/cms-sw/cmssw/pull/21078/files/e8a5f259ec7056352d1c24bbb9c0ea5b2dba01f7#diff-72d8a78a6ccf3dc6cc176329075a4d3fL3) and I don't like it since the list of things to be changed is large.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, as I said, I am also fine with this way
} | ||
return ret; | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't double
be replaced with T
here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @mmusich, this actually applies to all occurences of double
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or do you want to ensure that double
is used internally?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not really, everything is template type now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, thanks
not sure, if it should be const T&
in the function argument, but for the types it is intended for this should not really matter
@@ -167,7 +174,9 @@ class PrimaryVertexValidation : public edm::one::EDAnalyzer<edm::one::SharedReso | |||
// pT binning as in paragraph 3.2 of CMS-PAS-TRK-10-005 (https://cds.cern.ch/record/1279383/files/TRK-10-005-pas.pdf) | |||
|
|||
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | |||
const float mypT_bins_[nPtBins_+1] = {0.5,0.6,0.7,0.8,0.9,1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,2.0,2.1,2.2,2.3,2.4,2.5,2.6,2.7,2.8,2.9,3.0,3.1,3.2,3.3,3.4,3.5,3.6,3.7,3.8,3.9,4.0,4.1,4.25,4.5,4.75,5.0,5.5,6.0,7.0,8.0,9.0,11.0,14.0,20.}; | |||
//const float mypT_bins_[nPtBins_+1] = {0.5,0.6,0.7,0.8,0.9,1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,2.0,2.1,2.2,2.3,2.4,2.5,2.6,2.7,2.8,2.9,3.0,3.1,3.2,3.3,3.4,3.5,3.6,3.7,3.8,3.9,4.0,4.1,4.25,4.5,4.75,5.0,5.5,6.0,7.0,8.0,9.0,11.0,14.0,20.}; | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can these comments be removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer to keep them, for reference.
@@ -163,6 +163,7 @@ | |||
CommonTrackSelectionRefitting = """ | |||
import Alignment.CommonAlignment.tools.trackselectionRefitting as trackselRefit | |||
process.seqTrackselRefit = trackselRefit.getSequence(process, '.oO[trackcollection]Oo.', | |||
isPVValidation=.oO[ispvvalidation]Oo., |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see above
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see #21078 (comment)
@@ -519,6 +519,7 @@ def getRepMap(self, alignment=None): | |||
"istracksplitting": str(isinstance(self, TrackSplittingValidation)), | |||
"cosmics0T": str(self.cosmics0T), | |||
"use_d0cut": str(self.use_d0cut), | |||
"ispvvalidation": str(self.isPVValidation) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see above
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see #21078 (comment)
@@ -535,6 +536,9 @@ def getRepMap(self, alignment=None): | |||
def use_d0cut(self): | |||
return "Cosmics" not in self.general["trackcollection"] #use it for collisions only | |||
@property | |||
def isPVValidation(self): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see above
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see #21078 (comment)
@@ -48,6 +49,10 @@ def use_d0cut(self): | |||
return False | |||
|
|||
@property | |||
def isPVValidation(self): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see above
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see #21078 (comment)
# process.FinalTrackRefitter.src = "generalTracks" | ||
# process.FinalTrackRefitter.TrajectoryInEvent = True | ||
# process.FinalTrackRefitter.NavigationSchool = '' | ||
# process.FinalTrackRefitter.TTRHBuilder = "WithAngleAndTemplate" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please remove the commented code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As I am still not totally convinced that the CTSR sequence is OK to use in all corner use cases I prefer to keep track of the standard refitter configuration (at least in the test cfg: in the template of the all-ini-one it is removed)
The code-checks are being triggered in jenkins. |
+code-checks |
@ghellwig if you are fine with the implementation of the review, please restart the tests, otherwise I'll wait for more comments. Thank you! |
please test |
The tests are being triggered in jenkins. |
@mmusich I am fine with it now |
+1 |
This pull request is fully signed and it will be integrated in one of the next master IBs after it passes the integration tests. This pull request will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar (and backports should be raised in the release meeting by the corresponding L2) |
+1 The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic: |
Comparison job queued. |
Comparison is ready Comparison Summary:
|
+1 |
Greetings,
this is the summary of the updates proposed in this PR:
ini
file using 2016 legacy data and 2017 MC with final pixel geometry.