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

Jump to bottom

Removing copyright declarations to comply with the code rules. #121

Merged
merged 13 commits into from Aug 26, 2013
Merged

Removing copyright declarations to comply with the code rules. #121

merged 13 commits into from Aug 26, 2013

Conversation

nclopezo
Copy link
Contributor

These commits remove the copyright declaration from the files flagged as violating rule 4.

@davidlt
Copy link
Contributor

davidlt commented Jul 16, 2013

You cannot just remove them without reading the licences/copyrights, e.g. FWCore/Utilities/interface/md5.h:

3. This notice may not be removed or altered from any source distribution.

apfeiffer1
apfeiffer1 reviewed Jul 16, 2013
View reviewed changes
FWCore/Utilities/interface/md5.h
@@ -2,7 +2,6 @@
#define FWCore_Utilities_md5_h

/*
Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one we can NOT remove !!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed. My bad. I stripped off those coming from the outside in a list a gave @nclopezo , but this one slipped in. Thanks for double-checking.

@ktf
Copy link
Contributor

ktf commented Jul 16, 2013

The following categories have been rejected by andreasp (a.k.a. @apfeiffer1 on GitHub): Database

@cms-git-db

@apfeiffer1
Copy link
Contributor

I rejected this patch on the base that we can't simply remove all and any copyright statement without at least getting written permission by the owners of the copyright. While we may argue that this is OK for CMS members (incl. ex-members and institutes), we clearly can't remove them from the files we included verbatim (I noted a few inline).
So if everyone agrees (Liz should tell) we can remove the ones from CMS (ex-)members/institutes, but for the other ones we will need to modify the checking tool to allow those.

@smuzaffar
Copy link
Contributor

For these we can just add the exception in cms code rule checker.

ktf
ktf reviewed Jul 16, 2013
View reviewed changes
DataFormats/Math/interface/sse_mathfun.h
@@ -37,7 +37,7 @@
not expect any significant performance improvement with SSE2.
*/

/* Copyright (C) 2007 Julien Pommier
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nclopezo This one cannot be remove, actually. Sorry for including it in the initial list.

@ktf
Copy link
Contributor

ktf commented Jul 16, 2013

For the record, IIRC we CMS has copyright on all code provided by members of the collaboration. I gave a list of known people / institutes and some which should not be removed slipped in. @nclopezo if you can update the patch with the suggested changes, I'll follow up with Liz about the policy, but I'm pretty sure that was it. Those copyright statements were assigned to CMS at some point.

@ktf
Copy link
Contributor

ktf commented Jul 16, 2013

@smuzaffar I don't think we need exceptions, once the collaborators copyright statements are removed, we can simply veto any further CMS copyrighted material (and leave the valid ones alone).

@davidlt
Copy link
Contributor

davidlt commented Jul 16, 2013

@ktf , mechanism for ignoring specific files is already in place.

According to the code rule checker the following should be ignored already:

  • FWCore/Utilities/interface/math_private.h
  • FWCore/Utilities/interface/md5.h
  • FWCore/Utilities/interface/tinyxml.h
  • FWCore/Utilities/src/md5.c
  • FWCore/Utilities/src/tinyxml.cc
  • FWCore/Utilities/src/tinyxmlerror.cc
  • FWCore/Utilities/src/tinyxmlparser.cc
  • DataFormats/Common/interface/Trie.h
  • DataFormats/Math/interface/sse_mathfun.h
  • EventFilter/Processor/src/procUtils.cc
  • CondCore/ORA/src/GenMD5.cc
  • PhysicsTools/JetMCUtils/interface/combination.h

@ktf
Copy link
Contributor

ktf commented Jul 17, 2013

@davidlt, I know. But not when you do git grep opyright. We should probably
have a pre commit check that tells people not to commit new erroneously
copyrighted code or CVS keywords. Can you please look into whether we can do
it in the configuration of our own git?

@nclopezo
Removed Copyright Declarations for CalibFormats
1e75c8c 
Signed-off-by: David Mendez <david.mendez@cern.ch>
@nclopezo
Removed copyright declarations of DQMOffline and DQMServices.
86e3ed4 
Signed-off-by: David Mendez <david.mendez@cern.ch>
@nclopezo
Removed copyright declarations from DetectorDescription
0d0c072 
Signed-off-by: David Mendez <david.mendez@cern.ch>
@nclopezo
Removed copyright delcarations for FWCore
086ea8e 
Signed-off-by: David Mendez <david.mendez@cern.ch>
@nclopezo
Removed copyright declarations for IORawData
1573872 
Signed-off-by: David Mendez <david.mendez@cern.ch>
@nclopezo
Removed copyright declarations for L1Trigger.
efc4137 
Signed-off-by: David Mendez <david.mendez@cern.ch>
@nclopezo
Removed copyright declarations for OnlineDB
6104bed 
Signed-off-by: David Mendez <david.mendez@cern.ch>
@nclopezo
Removed Copyright declarations for PhysicsTools
4650345 
Signed-off-by: David Mendez <david.mendez@cern.ch>
@nclopezo
Copy link
Contributor Author

Hi All,

I just updated my branch taking into account your feedback.

@cmsbuild
Copy link
Contributor

The following categories have been signed by @deguio: DQM

@cms-git-dqm

@deguio deguio mentioned this pull request Jul 23, 2013
Closed
thspeer
thspeer reviewed Aug 2, 2013
View reviewed changes
RecoLocalTracker/SiPixelRecHits/src/sicif.h
@@ -49,7 +49,7 @@

/*
Cephes Math Library Release 2.1: January, 1989
Copyright 1984, 1987, 1989 by Stephen L. Moshier
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this comes from the cephes library (http://www.netlib.org/cephes/), can this copyright really be removed ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, this must be retained.

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 2, 2013

The following categories have been signed by @civanch: Full Simulation

@cms-git-simulation

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 6, 2013

The following categories have been signed by @vadler: Analysis

@cms-git-analysis

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 6, 2013

The following categories have been signed by @vadler: Analysis

@cms-git-analysis

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 8, 2013

The following categories have been signed by yana (a.k.a. @ianna on GitHub): Geometry

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

@cmsbuild
Copy link
Contributor

The following categories have been signed by @demattia: Calibration and Alignment

@cms-git-alca

@cmsbuild
Copy link
Contributor

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

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

@ktf
Copy link
Contributor

ktf commented Aug 16, 2013

@nclopezo can you clean up the last bit which is not to be removed? Thanks.

@ghost ghost assigned nclopezo Aug 16, 2013
@nclopezo
Copy link
Contributor Author

Hi All,

I updated my branch taking into account the feedback of @thspeer

@cmsbuild
Copy link
Contributor

The following categories have been signed by speer (a.k.a. @thspeer on GitHub): Reconstruction

@cms-git-reconstruction

@cmsbuild
Copy link
Contributor

The following categories have been signed by andreasp (a.k.a. @apfeiffer1 on GitHub): Database

@cms-git-db

ktf added a commit that referenced this pull request Aug 26, 2013
@ktf
Merge pull request #121 from nclopezo/removing-copyright-declarations
faf53ca 
Removing copyright declarations to comply with the code rules. Liz said "Ok, to merge".
@ktf ktf merged commit faf53ca into cms-sw:CMSSW_7_0_X Aug 26, 2013
nclopezo pushed a commit to nclopezo/cmssw that referenced this pull request Nov 21, 2014
@aledegano
Merge pull request cms-sw#121 from degano/RecoMET_categories
1d453d0 
Create package RecoMET/METPUSubtraction.
gpetruc added a commit to gpetruc/cmssw that referenced this pull request Nov 23, 2014
@gpetruc
Merge pull request cms-sw#121 from gpetruc/IVF-CMG_MiniAOD_Lite_V6_0_…
49d8325 
…from-CMSSW_7_0_6

Secondary vertices from IVF, and gen level event weights
gdimperi pushed a commit to gdimperi/cmssw that referenced this pull request Jun 21, 2015
@gpetruc
Merge pull request cms-sw#121 from chenmingshui/NoOptimizeCachingNLL_…
1ee4231 
…ForRooExponentialWithMoreParameters

add option for saving other parameters to output in MultiDimFit
arizzi added a commit to arizzi/cmssw that referenced this pull request Jul 21, 2015
@arizzi
Merge pull request cms-sw#121 from perrozzi/vhbb/vhbbHeppy74X
1046001 
added new datasets
mariadalfonso pushed a commit to mariadalfonso/cmssw that referenced this pull request May 6, 2017
@amarini
Merge pull request cms-sw#121 from grauco/qg_validation
60719b7 
Qg validation
cfmcginn pushed a commit to cfmcginn/cmssw that referenced this pull request Jun 9, 2017
@mverwe
Merge pull request cms-sw#121 from mverwe/SDBetaPos
db990a3 
Jet updates + PF analyzer
makortel added a commit to makortel/cmssw that referenced this pull request Aug 9, 2018
@makortel @fwyzard
HeterogeneousEvent::put returns OrphanHandle (cms-sw#121)
c21bbb7
slava77 pushed a commit to slava77/cmssw that referenced this pull request Mar 28, 2019
@steggema
Merge pull request cms-sw#121 from steggema/CMSSW_10_6_0_pre2_TauReco…
420ade7 
…MiniAOD_ResolveConflicts

Tau reco on MiniAOD: Resolve conflicts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nclopezo nclopezo

Labels
alca-pending analysis-pending core-pending dqm-pending geometry-pending l1-pending reconstruction-approved simulation-pending
Projects
None yet
Milestone
CMSSW_7_0_0_pre3
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@nclopezo @davidlt @ktf @apfeiffer1 @smuzaffar @cmsbuild @Dr15Jones @thspeer