Track trigger primitives in 81X #15691

sviret · 2016-09-01T08:36:02Z

This PR is an 'analog' rebase of #15075, to the latest available IB. It's addressing all the comments of #15075, so should be ready to be pushed in 81X.

cmsbuild · 2016-09-01T08:37:22Z

A new Pull Request was created by @sviret (Seb Viret) for CMSSW_8_1_X.

It involves the following packages:

L1Trigger/TrackTrigger
SLHCUpgradeSimulations/Configuration
SimTracker/TrackTriggerAssociation

@civanch, @mdhildreth, @cmsbuild, @rekovic, @mulhearn, @davidlange6 can you please review it and eventually sign? Thanks.
@makortel, @sdevissc, @GiacomoSguazzoni, @rovere, @VinInn, @Martin-Grunewald, @threus, @dgulhan this is something you requested to watch as well.
@slava77, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

kpedro88 · 2016-09-01T15:03:28Z

@cmsbuild please test

cmsbuild · 2016-09-01T15:03:50Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/14902/console

cmsbuild · 2016-09-01T15:57:44Z

+1
Tested at: 5cbea77
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-15691/14902/summary.html

cmsbuild · 2016-09-01T17:01:37Z

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-15691/14902/summary.html

civanch · 2016-09-05T12:45:35Z

+1

boudoul · 2016-09-06T07:35:51Z

hello @rekovic, @mulhearn , could you please review this PR ? Thanks

davidlange6 · 2016-09-06T08:03:35Z

is it possible to get some idea of the changes since the last time this big PR was reviewed? the commit history is unfortunately lacking..

On Sep 6, 2016, at 9:35 AM, boudoul [email protected] wrote:

hello @rekovic, @mulhearn , could you please review this PR ? Thanks

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.

sviret · 2016-09-06T08:07:45Z

@davidlange6, most of the technical comments you made on #15075 were implemented. The only comment which was not implemented was related to use of detid+1 and detid+2 in order to get module sensors. I can find a temporary workaround to that, but a real solution would imply a modification of the tracker topology class, which is something I will not do.

davidlange6 · 2016-09-06T08:10:36Z

any easy way to get a diff?

On Sep 6, 2016, at 10:07 AM, Seb Viret [email protected] wrote:

@davidlange6, most of the technical comments you made on #15075 were implemented. The only comment which was not implemented was related to use of detid+1 and detid+2 in order to get module sensors. I can find a temporary workaround to that, but a real solution would imply a modification of the tracker topology class, which is something I will not do.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.

sviret · 2016-09-06T08:38:51Z

@davidlange6 here is a diff of the files I have modified between this commit and the last one (in pre11) from #15075 (pre7)

diff -r CMSSW_8_1_0_pre7/src/L1Trigger/TrackTrigger/plugins/TTStubBuilder.cc CMSSW_8_1_0_pre11/src/L1Trigger/TrackTrigger/plugins/TTStubBuilder.cc
78c78

< std::map< int, std::vector< TTStub< Ref_Phase2TrackerDigi_ > > > moduleStubs; /// Temporary storage for stubs before max check

std::unordered_map< int, std::vector< TTStub< Ref_Phase2TrackerDigi_ > > > moduleStubs; /// Temporary storage for stubs before max check
88c88

< tempOutput.clear();
  // tempOutput.clear();
139c139

< TTStub< Ref_Phase2TrackerDigi_ > tempTTStub = tempOutput.at( iTempStub );
    const TTStub< Ref_Phase2TrackerDigi_ >& tempTTStub = tempOutput[iTempStub];
157,159c157,159
< std::vector< TTStub< Ref_Phase2TrackerDigi_ > > tempStubs;
< tempStubs.clear();

< tempStubs.push_back( tempTTStub );
        std::vector< TTStub< Ref_Phase2TrackerDigi_ > > tempStubs(1,tempTTStub);
        //tempStubs.clear();
        //tempStubs.push_back( tempTTStub );

diff -r CMSSW_8_1_0_pre7/src/L1Trigger/TrackTrigger/src/TTClusterAlgorithm_official.cc CMSSW_8_1_0_pre11/src/L1Trigger/TrackTrigger/src/TTClusterAlgorithm_official.cc
157,158c157,164
<

< if ( abs( candCluster.at(0)->row() - candCluster.back()->row() ) < mWidthCut || /// one should add 1 to use <=

  /*
  std::cout << candCluster.at(0)->row() - candCluster.back()->row() << " / " 
  << static_cast<int>(candCluster.at(0)->row() - candCluster.back()->row()) << " / " 
  << abs( candCluster.at(0)->row() - candCluster.back()->row() ) << " / " 
  << std::abs( candCluster.at(0)->row() - candCluster.back()->row() ) << " / " 
  << mWidthCut << std::endl;
  */
  if ( std::abs(  static_cast<int>(candCluster.at(0)->row() - candCluster.back()->row()) ) < mWidthCut || /// one should add 1 to use <=

172c178

< if ( abs( candCluster.at(0)->row() - candCluster.back()->row() ) < mWidthCut || /// one should add 1 to use <=

  if ( std::abs(  static_cast<int>(candCluster.at(0)->row() - candCluster.back()->row()) ) < mWidthCut || /// one should add 1 to use <=

diff -r CMSSW_8_1_0_pre7/src/L1Trigger/TrackTrigger/test/SLHC_MBIAS_TkOnly_FLAT_81X.py CMSSW_8_1_0_pre11/src/L1Trigger/TrackTrigger/test/SLHC_MBIAS_TkOnly_FLAT_81X.py
51c51

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')

diff -r CMSSW_8_1_0_pre7/src/L1Trigger/TrackTrigger/test/SLHC_MBIAS_TkOnly_TILTED_81X.py CMSSW_8_1_0_pre11/src/L1Trigger/TrackTrigger/test/SLHC_MBIAS_TkOnly_TILTED_81X.py
51c51

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')

diff -r CMSSW_8_1_0_pre7/src/L1Trigger/TrackTrigger/test/SLHC_PGUN_TkOnly_FLAT_81X.py CMSSW_8_1_0_pre11/src/L1Trigger/TrackTrigger/test/SLHC_PGUN_TkOnly_FLAT_81X.py
64c64

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')

diff -r CMSSW_8_1_0_pre7/src/L1Trigger/TrackTrigger/test/SLHC_PGUN_TkOnly_TILTED_81X.py CMSSW_8_1_0_pre11/src/L1Trigger/TrackTrigger/test/SLHC_PGUN_TkOnly_TILTED_81X.py
67c67

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')
121a122,123
#process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.endjob_step,process.RAWSIMoutput_step)

diff -r CMSSW_8_1_0_pre7/src/L1Trigger/TrackTrigger/test/SLHC_PU_TkOnly_FLAT_81X.py CMSSW_8_1_0_pre11/src/L1Trigger/TrackTrigger/test/SLHC_PU_TkOnly_FLAT_81X.py
59c59

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')

diff -r CMSSW_8_1_0_pre7/src/L1Trigger/TrackTrigger/test/SLHC_PU_TkOnly_TILTED_81X.py CMSSW_8_1_0_pre11/src/L1Trigger/TrackTrigger/test/SLHC_PU_TkOnly_TILTED_81X.py
62c62

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')

cmsbuild · 2016-09-22T10:32:54Z

Pull request #15691 was updated. @ghellwig, @ianna, @cerminar, @fabozzi, @Martin-Grunewald, @rekovic, @vanbesien, @govoni, @perrotta, @civanch, @monttj, @silviodonato, @franzoni, @cmsbuild, @fwyzard, @davidlange6, @smuzaffar, @Dr15Jones, @cvuosalo, @mdhildreth, @slava77, @ggovi, @mmusich, @mulhearn, @perrozzi, @thuer, @dmitrijus, @srimanob, @hengne can you please check and sign again.

sviret · 2016-09-22T10:36:23Z

@davidlange6 just made the modif requested, but looks like something has gone wrong when I pushed the commit (many packages I did never touched have been added, apparently). Is there anyway to go back to the previous situation...

davidlange6 · 2016-09-22T11:14:28Z

do you still have the commands you issued in your history buffer?

On Sep 22, 2016, at 12:36 PM, Seb Viret [email protected] wrote:

@davidlange6 just made the modif requested, but looks like something has gone wrong when I pushed the commit (many packages I did never touched have been added, apparently). Is there anyway to go back to the previous situation...

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.

sviret · 2016-09-22T11:21:45Z

@davidlange6 , I started from the latest IB (CMSSW_8_1_X_2016-09-21-2300). Then I applied the following commands:

[###]> git-cms-addpkg L1Trigger/TrackTrigger
[###]> git-cms-addpkg SLHCUpgradeSimulations/Configuration
[###]> git-cms-addpkg SimTracker/TrackTriggerAssociation
[###]> git-pull https://github.com/sviret/cmssw 81X_TTPrimitives_2

There I made my modifications, added to modified files, commited and pushed to the branch 81X_TTPrimitives_2:

[###]> git push https://github.com/sviret/cmssw 81X_TTPrimitives_2
Counting objects: 12002, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (2595/2595), done.
Writing objects: 100% (8549/8549), 4.04 MiB | 0 bytes/s, done.
Total 8549 (delta 6469), reused 7680 (delta 5881)
remote: Resolving deltas: 100% (6469/6469), completed with 1834 local objects.
To https://github.com/sviret/cmssw
5cbea77..45f3cd6 81X_TTPrimitives_2 -> 81X_TTPrimitives_2

davidlange6 · 2016-09-22T11:30:12Z

likely
git rebase CMSSW_8_1_X_2016-09-21-2300
git push my-cmssw 81X_TTPrimitives_2

…into 81X_TTPrimitives_2

cmsbuild · 2016-09-22T11:46:34Z

Pull request #15691 was updated. @ghellwig, @ianna, @cerminar, @fabozzi, @Martin-Grunewald, @rekovic, @vanbesien, @govoni, @perrotta, @civanch, @monttj, @silviodonato, @franzoni, @cmsbuild, @fwyzard, @davidlange6, @smuzaffar, @Dr15Jones, @cvuosalo, @mdhildreth, @slava77, @ggovi, @mmusich, @mulhearn, @perrozzi, @thuer, @dmitrijus, @srimanob, @hengne can you please check and sign again.

sviret · 2016-09-22T11:48:40Z

@davidlange6 did the rebase, don't know if it's ok now

davidlange6 · 2016-09-22T11:50:11Z

doesn't look like it..
lets see.

davidlange6 · 2016-09-22T11:54:57Z

git push my-cmssw HEAD:<your_branch_name>

seems to work better for me.

On Sep 22, 2016, at 1:48 PM, Seb Viret [email protected] wrote:

@davidlange6 did the rebase, don't know if it's ok now

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.

sviret · 2016-09-22T12:31:20Z

For me it's not, unfortunately.... Looks as if I'm once again defeated by git.....

davidlange6 · 2016-09-22T12:36:45Z

i'll make a new PR then. I made it with

253 13:50 scram p CMSSW_8_1_X_2016-09-22-0900
254 13:50 cd CMSSW_8_1_X_2016-09-22-0900
255 13:50 cmsenv
256 13:51 cd src
257 13:51 git cms-merge-topic 15691
258 13:52 git checkout -b rb15691
259 13:52 git push my-cmssw HEAD:rb15691

davidlange6 · 2016-09-22T12:40:03Z

replaced by #15949

cmsbuild added this to the Next CMSSW_8_1_X milestone Sep 1, 2016

cmsbuild added simulation-pending l1-pending pending-signatures tests-pending orp-pending comparison-pending labels Sep 1, 2016

cmsbuild added tests-started and removed tests-pending labels Sep 1, 2016

cmsbuild added tests-approved and removed tests-started labels Sep 1, 2016

cmsbuild added comparison-available and removed comparison-pending labels Sep 1, 2016

cmsbuild added simulation-approved and removed simulation-pending labels Sep 5, 2016

pmeridian added 4 commits September 13, 2016 12:25

Adding also the plugin

fc54a9d

Working configuration

2249a26

Removing printout

ede7917

working version

827b2c9

cmsbuild added db-pending dqm-pending generators-pending geometry-pending hlt-pending l1-pending operations-pending pdmv-pending pending-signatures reconstruction-pending simulation-pending tests-pending labels Sep 22, 2016

Seb added 3 commits September 22, 2016 13:42

new updated branch

14b301f

Remove all TkOnly dependencies from SLHCUpgradeSimulation package

e4a598f

Merge branch '81X_TTPrimitives_2' of https://github.com/sviret/cmssw …

b3b2927

…into 81X_TTPrimitives_2

davidlange6 mentioned this pull request Sep 22, 2016

l1 track trigger rebased #15949

Merged

davidlange6 closed this Sep 22, 2016

sviret deleted the 81X_TTPrimitives_2 branch September 26, 2016 09:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Track trigger primitives in 81X #15691

Track trigger primitives in 81X #15691

sviret commented Sep 1, 2016

cmsbuild commented Sep 1, 2016

kpedro88 commented Sep 1, 2016

cmsbuild commented Sep 1, 2016 •

edited

Loading

cmsbuild commented Sep 1, 2016

cmsbuild commented Sep 1, 2016

civanch commented Sep 5, 2016

boudoul commented Sep 6, 2016

davidlange6 commented Sep 6, 2016

sviret commented Sep 6, 2016

davidlange6 commented Sep 6, 2016

sviret commented Sep 6, 2016

< tempOutput.clear();

< TTStub< Ref_Phase2TrackerDigi_ > tempTTStub = tempOutput.at( iTempStub );

< tempStubs.push_back( tempTTStub );

< if ( abs( candCluster.at(0)->row() - candCluster.back()->row() ) < mWidthCut || /// one should add 1 to use <=

cmsbuild commented Sep 22, 2016

sviret commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

sviret commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

cmsbuild commented Sep 22, 2016

sviret commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

sviret commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

Track trigger primitives in 81X #15691

Track trigger primitives in 81X #15691

Conversation

sviret commented Sep 1, 2016

cmsbuild commented Sep 1, 2016

kpedro88 commented Sep 1, 2016

cmsbuild commented Sep 1, 2016 • edited Loading

cmsbuild commented Sep 1, 2016

cmsbuild commented Sep 1, 2016

civanch commented Sep 5, 2016

boudoul commented Sep 6, 2016

davidlange6 commented Sep 6, 2016

sviret commented Sep 6, 2016

davidlange6 commented Sep 6, 2016

sviret commented Sep 6, 2016

< std::map< int, std::vector< TTStub< Ref_Phase2TrackerDigi_ > > > moduleStubs; /// Temporary storage for stubs before max check

< tempOutput.clear();

< TTStub< Ref_Phase2TrackerDigi_ > tempTTStub = tempOutput.at( iTempStub );

< tempStubs.push_back( tempTTStub );

< if ( abs( candCluster.at(0)->row() - candCluster.back()->row() ) < mWidthCut || /// one should add 1 to use <=

< if ( abs( candCluster.at(0)->row() - candCluster.back()->row() ) < mWidthCut || /// one should add 1 to use <=

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

< process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')

cmsbuild commented Sep 22, 2016

sviret commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

sviret commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

cmsbuild commented Sep 22, 2016

sviret commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

sviret commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

davidlange6 commented Sep 22, 2016

cmsbuild commented Sep 1, 2016 •

edited

Loading