Skip to content

Commit

Permalink
Merge remote-tracking branch 'official-cmssw/CMSSW_7_0_X' into removi…
Browse files Browse the repository at this point in the history 
…ng-copyright-declarations
  • Loading branch information
@nclopezo
nclopezo committed Aug 16, 2013
2 parents 4782ffd + 6f639b8 commit b3c19e3
Show file tree
Hide file tree
Showing 7,946 changed files with 354,816 additions and 68,382 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
__init__.py
*.pyc
4 changes: 2 additions & 2 deletions Alignment/CocoaApplication/interface/CocoaAnalyzer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class CocoaAnalyzer : public edm::EDAnalyzer
explicit CocoaAnalyzer(int i) { }
virtual ~ CocoaAnalyzer() { }

virtual void beginJob();
virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
virtual void beginJob() override;
virtual void analyze(const edm::Event& e, const edm::EventSetup& c) override;
// see note on endJob() at the bottom of the file.
// virtual void endJob() ;

Expand Down
6 changes: 3 additions & 3 deletions Alignment/CocoaModel/interface/CocoaDaqReaderRoot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ class CocoaDaqReaderRoot : public CocoaDaqReader {
public:
CocoaDaqReaderRoot(const std::string& m_inFileName );
~CocoaDaqReaderRoot();
virtual bool ReadNextEvent();
virtual bool ReadEvent( int nev );
virtual void BuildMeasurementsFromOptAlign( std::vector<OpticalAlignMeasurementInfo>& measList );
virtual bool ReadNextEvent() override;
virtual bool ReadEvent( int nev ) override;
virtual void BuildMeasurementsFromOptAlign( std::vector<OpticalAlignMeasurementInfo>& measList ) override;

public:
int GetNEvents() const { return nev; }
Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/interface/AlignSetup.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* It returns 0 if the name is not found on get().
* It throws an exception if an object of the same name exists on put().
*
* $Date: 2008/02/15 18:11:45 $
* $Revision: 1.4 $
* $Date: 2008/02/12 18:06:49 $
* $Revision: 1.3 $
* \author Chung Khim Lae
*/

Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/interface/AlignTools.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*
* Tools for comparing alignables
*
* $Date: 2009/02/17 13:56:41 $
* $Revision: 1.6 $
* $Date: 2008/06/17 12:46:54 $
* $Revision: 1.5 $
* \author Nhan Tran
*/

Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignment/interface/Alignable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ class SurfaceDeformation;
* Any Alignable object can be moved and rotated.
* Also an alignment uncertainty can be set.
*
* $Date: 2012/12/11 19:11:02 $
* $Revision: 1.37 $
* (last update by $Author: flucke $)
* $Date: 2011/09/19 11:42:35 $
* $Revision: 1.36 $
* (last update by $Author: mussgill $)
*/

class AlignmentParameters;
Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignment/interface/AlignableBeamSpot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Original author: Andreas Mussgiller, August 2010
*
* $Date: 2010/10/29 12:16:28 $
* $Revision: 1.3 $
* (last update by $Author: mussgill $)
* $Date: 2010/10/26 19:53:53 $
* $Revision: 1.2 $
* (last update by $Author: flucke $)
*/

#include "Alignment/CommonAlignment/interface/Alignable.h"
Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/interface/AlignableBuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*
* A class to build alignable composites.
*
* $Date: 2013/01/07 19:28:55 $
* $Revision: 1.3 $
* $Date: 2007/10/18 09:41:07 $
* $Revision: 1.2 $
* \author Chung Khim Lae
*/

Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignment/interface/AlignableDetOrUnitPtr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*
* Original author: Gero Flucke, April 2007
*
* $Date: 2010/09/10 10:29:17 $
* $Revision: 1.4 $
* (last update by $Author: mussgill $)
* $Date: 2009/02/28 21:04:59 $
* $Revision: 1.3 $
* (last update by $Author: flucke $)
*/

class Alignable;
Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/interface/AlignableExtras.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*
* Original author: Andreas Mussgiller, August 2010
*
* $Date: 2010/09/10 10:26:20 $
* $Revision: 1.1 $
* $Date: 2009/02/28 21:04:59 $
* $Revision: 1.3 $
* (last update by $Author: mussgill $)
*/

Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignment/interface/AlignableNavigator.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// $Revision: 1.16 $
// $Date: 2010/09/10 10:30:03 $
// (last update by $Author: mussgill $)
// $Revision: 1.15 $
// $Date: 2009/02/28 21:06:53 $
// (last update by $Author: flucke $)

#ifndef Alignment_CommonAlignment_AlignableNavigator_h
#define Alignment_CommonAlignment_AlignableNavigator_h
Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/interface/AlignableSurface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*
* A class to hold a surface with width and length for alignment purposes.
*
* $Date: 2012/12/30 12:18:35 $
* $Revision: 1.9 $
* $Date: 2007/04/25 18:37:59 $
* $Revision: 1.8 $
* \author Chung Khim Lae
*/

Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignment/interface/AlignmentParameters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
/// parameters/derivatives/covariance as subvector/submatrix
/// of reduced size.
///
/// $Date: 2011/09/19 11:44:21 $
/// $Revision: 1.10 $
/// (last update by $Author: mussgill $)
/// $Date: 2010/10/26 19:50:21 $
/// $Revision: 1.9 $
/// (last update by $Author: flucke $)

// include and not forward declare to ensure automatic conversion from AlignableDet(Unit):
// NO: include problems... #include "Alignment/CommonAlignment/interface/AlignableDetOrUnitPtr.h"
Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/interface/Counters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* User gets a counter using its structure type via Counters::get(type).
* Each sub-system has its own concrete counter class implementation.
*
* $Date: 2013/01/07 19:28:55 $
* $Revision: 1.3 $
* $Date: 2007/10/18 09:41:07 $
* $Revision: 1.2 $
* \author Chung Khim Lae
*/

Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignment/interface/MisalignmentScenarioBuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

/// \class MisalignmentScenarioBuilder
///
/// $Date: 2012/06/30 09:36:23 $
/// $Revision: 1.11 $
/// $Date: 2011/09/19 11:44:50 $
/// $Revision: 1.10 $
///
/// $Author: eulisse $
/// $Author: mussgill $
/// \author Frederic Ronga - CERN-PH-CMG

#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/interface/StructureType.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*
* Basically list the levels in the detector's hierarchy.
*
* $Date: 2012/06/28 10:02:14 $
* $Revision: 1.6 $
* $Date: 2010/09/10 10:28:38 $
* $Revision: 1.5 $
* \author Chung Khim Lae
*/

Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/interface/SurveyDet.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*
* Class to hold survey info.
*
* $Date: 2007/10/08 13:21:29 $
* $Revision: 1.5 $
* $Date: 2007/04/07 03:29:38 $
* $Revision: 1.4 $
* \author Chung Khim Lae
*/

Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/interface/SurveyResidual.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* For more info, please refer to
* http://www.pha.jhu.edu/~gritsan/cms/cms-note-survey.pdf
*
* $Date: 2008/11/26 10:21:09 $
* $Revision: 1.7 $
* $Date: 2007/11/09 07:45:04 $
* $Revision: 1.6 $
* \author Chung Khim Lae
*/

Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/interface/Utilities.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*
* Namespace for common calculations in alignment.
*
* $Date: 2008/02/26 20:14:28 $
* $Revision: 1.12 $
* $Date: 2007/10/08 15:22:08 $
* $Revision: 1.10 $
* \author Chung Khim Lae
*/

Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/src/Alignable.cc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** \file Alignable.cc
*
* $Date: 2013/05/08 10:25:43 $
* $Revision: 1.25 $
* $Date: 2012/12/11 19:11:02 $
* $Revision: 1.23 $
* (last update by $Author: flucke $)
*/

Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignment/src/AlignableBeamSpot.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
*
* Original author: Andreas Mussgiller, August 2010
*
* $Date: 2011/03/22 09:49:50 $
* $Revision: 1.3 $
* (last update by $Author: innocent $)
* $Date: 2010/10/26 19:53:53 $
* $Revision: 1.2 $
* (last update by $Author: flucke $)
*/

#include "Alignment/CommonAlignment/interface/AlignableDetUnit.h"
Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignment/src/AlignableDetOrUnitPtr.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
*
* Original author: Gero Flucke, April 2007
*
* $Date: 2010/09/10 10:29:18 $
* $Revision: 1.4 $
* (last update by $Author: mussgill $)
* $Date: 2009/02/28 21:05:00 $
* $Revision: 1.3 $
* (last update by $Author: flucke $)
*/

#include "Alignment/CommonAlignment/interface/AlignableDetOrUnitPtr.h"
Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/src/AlignableExtras.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
*
* Original author: Andreas Mussgiller, August 2010
*
* $Date: 2011/09/19 11:46:29 $
* $Revision: 1.2 $
* $Date: 2010/09/10 10:26:20 $
* $Revision: 1.1 $
* (last update by $Author: mussgill $)
*/

Expand Down
4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/src/AlignableNavigator.cc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// \file AlignableNavigator.cc
//
// $Revision: 1.23 $
// $Date: 2010/10/11 12:25:33 $
// $Revision: 1.22 $
// $Date: 2010/09/10 10:30:03 $
// (last update by $Author: mussgill $)

#include "Alignment/CommonAlignment/interface/AlignableDet.h"
Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignment/src/MisalignmentScenarioBuilder.cc
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/// \file
///
/// $Date: 2012/06/30 09:36:24 $
/// $Revision: 1.12 $
/// $Date: 2010/11/29 20:41:55 $
/// $Revision: 1.11 $
///
/// $Author: eulisse $
/// $Author: wmtan $
/// \author Frederic Ronga - CERN-PH-CMG

#include <string>
Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignmentIO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
/// Correlations, as well as absolute and relative coordinates of
/// Alignables
///
/// $Date: 2007/10/08 14:38:15 $
/// $Revision: 1.4 $
/// (last update by $Author: cklae $)
/// $Date: 2006/11/30 09:56:03 $
/// $Revision: 1.3 $
/// (last update by $Author: flucke $)


#include "Alignment/CommonAlignment/interface/Utilities.h"
Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORoot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
/// concrete class for ROOT-based I/O of Alignment parameters, correlations
/// and Alignable positions. Derived from AlignmentIO
///
/// $Date: 2007/10/08 14:38:15 $
/// $Revision: 1.4 $
/// (last update by $Author: cklae $)
/// $Date: 2006/11/30 09:56:03 $
/// $Revision: 1.3 $
/// (last update by $Author: flucke $)

#include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentIO.h"

Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*
* Build Alignment Parameter Structure
*
* $Date: 2013/01/07 20:56:25 $
* $Revision: 1.12 $
* (last update by $Author: wmtan $)
* $Date: 2010/10/26 20:01:51 $
* $Revision: 1.11 $
* (last update by $Author: flucke $)
*/

#include "Alignment/CommonAlignment/interface/Utilities.h"
Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterSelector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
* additional constraints on eta, phi, r, x, y or z are possible.
* Furthermore stores the 'selection' of selected AlignmentParameters.
*
* $Date: 2013/01/07 20:56:25 $
* $Revision: 1.11 $
* (last update by $Author: wmtan $)
* $Date: 2010/11/22 08:40:08 $
* $Revision: 1.10 $
* (last update by $Author: mussgill $)
*/

#include "Alignment/CommonAlignment/interface/Utilities.h"
Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterStore.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
///
/// Basic class for management of alignment parameters and correlations
///
/// $Date: 2013/01/07 20:56:25 $
/// $Revision: 1.20 $
/// (last update by $Author: wmtan $)
/// $Date: 2011/05/23 20:50:31 $
/// $Revision: 1.19 $
/// (last update by $Author: mussgill $)

namespace edm { class ParameterSet; }
class AlignmentUserVariables;
Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
///
/// abstract base class for I/O of AlignmentParameters
///
/// $Date: 2007/10/08 14:38:15 $
/// $Revision: 1.5 $
/// (last update by $Author: cklae $)
/// $Date: 2007/01/23 16:07:08 $
/// $Revision: 1.4 $
/// (last update by $Author: fronga $)

class AlignmentParametersIO
{
Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIORoot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
///
/// Concrete class for ROOT-based I/O of AlignmentParameters
///
/// $Date: 2009/01/23 15:47:42 $
/// $Revision: 1.7 $
/// (last update by $Author: ewidl $)
/// $Date: 2008/09/02 15:31:23 $
/// $Revision: 1.6 $
/// (last update by $Author: flucke $)

#include "Alignment/CommonAlignment/interface/StructureType.h"
#include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORootBase.h"
Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignmentUserVariablesIO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
/// Abstract base class for I/O of AlignmentUserVariables.
/// Note that it is the caller's responsibility to delete objects created during reading.
///
/// $Date: 2007/10/08 14:38:15 $
/// $Revision: 1.5 $
/// $Author: cklae $ (at least last update...)
/// $Date: 2007/01/23 16:07:08 $
/// $Revision: 1.4 $
/// $Author: fronga $ (at least last update...)

class AlignmentUserVariables;

Expand Down
6 changes: 3 additions & 3 deletions Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
*
* \author Gero Flucke
* \date August 2012
* $Revision: 1.3 $
* $Date: 2013/05/31 12:13:40 $
* (last update by $Author: flucke $)
* $Revision: 1.2.2.1 $
* $Date: 2013/04/23 08:13:27 $
* (last update by $Author: jbehr $)
*
* Base class for the calibrations that are integrated
* into the alignment algorithms.
Expand Down
Loading

0 comments on commit b3c19e3

Please sign in to comment.