Relocate si pixel lorentz angle db2 cond tools #2982

hidaspal · 2014-03-23T11:45:45Z

No description provided.

hidaspal · 2014-03-23T11:48:47Z

The SiPixelLorentzAngle condition tools were at a wrong place, at CalibTracker instead of CondTools. They have been relocated by this update. In addition the python scripts now the latest working ones.

cmsbuild · 2014-03-23T12:34:07Z

A new Pull Request was created by @hidaspal for CMSSW_7_1_X.

Relocate si pixel lorentz angle db2 cond tools

It involves the following packages:

CalibTracker/SiPixelLorentzAngle
CondTools/SiPixel

@apfeiffer1, @diguida, @cmsbuild, @nclopezo, @rcastello, @ggovi, @Degano can you please review it and eventually sign? Thanks.
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.
@nclopezo, @ktf you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

diguida · 2014-03-23T14:04:18Z

CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py

+except KeyError:
+    user = subprocess.call('whoami')
+    # user = commands.getoutput('whoami')
+


A faster and more secure way to get the user running the process is:

import getpass user = getpass.getuser()

diguida · 2014-03-23T22:24:23Z

+1

cmsbuild · 2014-03-23T22:28:19Z

Pull request #2982 was updated. @ggovi, @cmsbuild, @apfeiffer1, @Degano, @nclopezo can you please check and sign again.

nclopezo · 2014-03-24T08:59:40Z

@hidaspal
Hi, this pull request is unmergeable, could you please rebase it?

hidaspal · 2014-03-24T11:02:26Z

Hi,

What does it mean exactly? Starting from another release?
I based on CMSSW_7_1_0_pre4, which is the latest one.

I saw a message, that it is not mergeable, but the message
also suggested to continue, no problem.

Cheers,
Pal

On Mon, 24 Mar 2014, David Mendez wrote:

@hidaspal
Hi, this pull request is unmergeable, could you please rebase it?

?
Reply to this email directly or view it onGitHub.[4940954__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcxMTI3MDc4MiwiZGF0YSI6eyJpZCI6Mjgz
MTcxNTh9fQ==--136887622384868b362f1e2df00322b5c43b5ef4.gif]

nclopezo · 2014-03-24T12:25:41Z

Hi,

You can follow the instructions that are here:

http://cms-sw.github.io/cmssw/tutorial-forward-port.html

hidaspal · 2014-03-25T14:11:35Z

Hopefully it is OK now. "scram b clean" does not make it clean enough. scram b found the removed headers. On the new place cc files referred to the old, not to the new place of the interfaces. Now on a new area "git cms-merge-topic hidaspal:relocateSiPixelLorentzAngleDB2CondTools" compiles.

cmsbuild · 2014-03-25T14:13:28Z

Pull request #2982 was updated. @apfeiffer1, @diguida, @cmsbuild, @nclopezo, @rcastello, @ggovi, @Degano can you please check and sign again.

nclopezo · 2014-03-25T14:46:42Z

Hi @hidaspal
If you try to merge this pull request with the latest IB you still have conflicts. If you do:

scram p CMSSW_7_1_X_2014-03-25-0200
cd CMSSW_7_1_X_2014-03-25-0200/
cmsenv
git cms-merge-topic 2982

It will fail and then if you do:

cd src/
git status

you will get the following:

# On branch merge-attempt
# You have unmerged paths.
#   (fix conflicts and run "git commit")
#
# Changes to be committed:
#
#   deleted:    CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngleDB.cc
#   deleted:    CalibTracker/SiPixelLorentzAngle/test/SealModules.cc
#   deleted:    CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleDB_cfg.py
#   deleted:    CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader_cfg.py
#   modified:   CondTools/SiPixel/test/SealModules.cc
#   new file:   CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py
#   renamed:    CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader.cc -> CondTools/SiPixel/test/SiPixelLorentzAngleReader.cc
#   renamed:    CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader.h -> CondTools/SiPixel/test/SiPixelLorentzAngleReader.h
#   modified:   CondTools/SiPixel/test/prova.db
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#   both deleted:       CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngleDB.h
#   deleted by us:      CalibTracker/SiPixelLorentzAngle/src/SealModules.cc
#   added by us:        CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngleDB.h
#   both modified:      CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc
#   added by them:      CondTools/SiPixel/test/SiPixelLorentzAngleDB.h
#   both modified:      CondTools/SiPixel/test/SiPixelLorentzAngleReader_cfg.py

hidaspal · 2014-03-25T15:01:55Z

On Tue, 25 Mar 2014, David Mendez wrote:

Hi @hidaspal
If you try to merge this pull request with the latest IB you still have conflicts. If you do:

scram p CMSSW_7_1_X_2014-03-25-0200
cd CMSSW_7_1_X_2014-03-25-0200/
cmsenv
git cms-merge-topic 2982

It will fail and then if you do:

cd src/
git status

you will get the following:

On branch merge-attempt

You have unmerged paths.

(fix conflicts and run "git commit")

Changes to be committed:

deleted: CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngleDB.cc

deleted: CalibTracker/SiPixelLorentzAngle/test/SealModules.cc

deleted: CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleDB_cfg.py

deleted: CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader_cfg.py

modified: CondTools/SiPixel/test/SealModules.cc

new file: CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py

renamed: CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader.cc -> CondTools/SiPixel/test/SiPixelLorentzAngleR

eader.cc

renamed: CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader.h -> CondTools/SiPixel/test/SiPixelLorentzAngleRe

ader.h

modified: CondTools/SiPixel/test/prova.db

Unmerged paths:

(use "git add/rm ..." as appropriate to mark resolution)

both deleted: CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngleDB.h

deleted by us: CalibTracker/SiPixelLorentzAngle/src/SealModules.cc

added by us: CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngleDB.h

This line should not be here.

both modified: CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc

added by them: CondTools/SiPixel/test/SiPixelLorentzAngleDB.h

both modified: CondTools/SiPixel/test/SiPixelLorentzAngleReader_cfg.py

?
Reply to this email directly or view it onGitHub.[4940954__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcxMTM3ODAwNCwiZGF0YSI6eyJpZCI6MjgzMTcxNTh9fQ==--6bc5b459460a6
407311d475f6177099ba977631d.gif]

hidaspal · 2014-03-25T15:39:02Z

My test area is, where it compiles:

/afs/cern.ch/work/h/hidaspal/public/test_relocateLorentzAngleDB/

nclopezo · 2014-03-25T15:51:56Z

You should start from CMSSW_7_1_X_2014-03-25-0200 or the latest IB available instead of CMSSW_7_1_0_pre4.

hidaspal · 2014-03-25T18:34:31Z

I close this request, please consider #3022, which is based on CMSSW_7_1_X_2014-03-25-0200.

hidaspal added 2 commits March 23, 2014 12:10

moving SiPixelLorentzAngleReader

5ec3228

relocating SiPixelLorentzAngleDB

4ae765e

hidaspal added alca-pending labels Mar 23, 2014

diguida reviewed Mar 23, 2014
View reviewed changes

shutil and getpass used instead of os subprocess

cb1277d

hidaspal added alca-approved labels Mar 23, 2014

hidaspal added 2 commits March 25, 2014 13:05

fixed path in CondTools\/SiPixel\/test\/SealModules\.cc

1a1b789

fixed path in 2 other cc

c5a0892

hidaspal added alca-pending labels Mar 25, 2014

hidaspal mentioned this pull request Mar 25, 2014

rebase of relocateLorentzAngleDB #3022

Merged

hidaspal closed this Mar 25, 2014

Relocate si pixel lorentz angle db2 cond tools #2982

Relocate si pixel lorentz angle db2 cond tools #2982

Conversation

hidaspal commented Mar 23, 2014

hidaspal commented Mar 23, 2014

cmsbuild commented Mar 23, 2014

diguida Mar 23, 2014

Choose a reason for hiding this comment

diguida commented Mar 23, 2014

cmsbuild commented Mar 23, 2014

nclopezo commented Mar 24, 2014

hidaspal commented Mar 24, 2014

nclopezo commented Mar 24, 2014

hidaspal commented Mar 25, 2014

cmsbuild commented Mar 25, 2014

nclopezo commented Mar 25, 2014

hidaspal commented Mar 25, 2014

On branch merge-attempt

You have unmerged paths.

(fix conflicts and run "git commit")

Changes to be committed:

deleted: CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngleDB.cc

deleted: CalibTracker/SiPixelLorentzAngle/test/SealModules.cc

deleted: CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleDB_cfg.py

deleted: CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader_cfg.py

modified: CondTools/SiPixel/test/SealModules.cc

new file: CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py

renamed: CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader.cc -> CondTools/SiPixel/test/SiPixelLorentzAngleR

renamed: CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader.h -> CondTools/SiPixel/test/SiPixelLorentzAngleRe

modified: CondTools/SiPixel/test/prova.db

Unmerged paths:

(use "git add/rm ..." as appropriate to mark resolution)

both deleted: CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngleDB.h

deleted by us: CalibTracker/SiPixelLorentzAngle/src/SealModules.cc

added by us: CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngleDB.h

both modified: CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc

added by them: CondTools/SiPixel/test/SiPixelLorentzAngleDB.h

both modified: CondTools/SiPixel/test/SiPixelLorentzAngleReader_cfg.py

hidaspal commented Mar 25, 2014

nclopezo commented Mar 25, 2014

hidaspal commented Mar 25, 2014