Skip to content

Commit

Permalink
Merge branch 'CMSSW_7_4_X' of https://github.com/cms-sw/cmssw into my…
Browse files Browse the repository at this point in the history 
…-cmssw/CalibFormats_SiStripObjects_toTrackerTopology

Conflicts:
	CalibFormats/SiStripObjects/interface/SiStripDetCabling.h
  • Loading branch information
@nickmccoll
nickmccoll committed Feb 9, 2015
2 parents ba7d55f + ba7652e commit 8d7c857
Show file tree
Hide file tree
Showing 2,268 changed files with 131,169 additions and 176,131 deletions.
8 changes: 4 additions & 4 deletions Alignment/CocoaFit/interface/CocoaDBMgr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ class OpticalAlignments;
class OpticalAlignInfo;
class OpticalAlignMeasurements;
class Alignments;
class AlignmentErrors;
class AlignmentErrorsExtended;
class AlignTransform;
class AlignTransformError;
class AlignTransformErrorExtended;

class OpticalObject;

Expand All @@ -54,9 +54,9 @@ class CocoaDBMgr

OpticalAlignInfo GetOptAlignInfoFromOptO( OpticalObject* opto );

std::pair< Alignments*,AlignmentErrors*> BuildAlignments(bool bDT);
std::pair< Alignments*,AlignmentErrorsExtended*> BuildAlignments(bool bDT);
AlignTransform* GetAlignInfoFromOptO( OpticalObject* opto);
AlignTransformError* GetAlignInfoErrorFromOptO( OpticalObject* opto);
AlignTransformErrorExtended* GetAlignInfoErrorFromOptO( OpticalObject* opto);

private:
static CocoaDBMgr* instance;
Expand Down
54 changes: 27 additions & 27 deletions Alignment/CocoaFit/src/CocoaDBMgr.cc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "CondFormats/Alignment/interface/Alignments.h"
#include "CondFormats/Alignment/interface/AlignmentErrors.h"
#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
#include "CondFormats/Alignment/interface/AlignTransform.h"
#include "CondFormats/Alignment/interface/AlignTransformError.h"
#include "CondFormats/Alignment/interface/AlignTransformErrorExtended.h"
#include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "CondCore/DBCommon/interface/Exception.h"
Expand Down Expand Up @@ -101,9 +101,9 @@ bool CocoaDBMgr::DumpCocoaResults()
if( gomgr->GlobalOptions()["writeDBAlign"] > 0) {

// Build DT alignments and errors
std::pair< Alignments*,AlignmentErrors*> dtali = BuildAlignments(1);
std::pair< Alignments*,AlignmentErrorsExtended*> dtali = BuildAlignments(1);
Alignments* dt_Alignments = dtali.first;
AlignmentErrors* dt_AlignmentErrors = dtali.second;
AlignmentErrorsExtended* dt_AlignmentErrors = dtali.second;

// Dump DT alignments and errors
nrcd = dt_Alignments->m_align.size();
Expand All @@ -121,22 +121,22 @@ bool CocoaDBMgr::DumpCocoaResults()
if(ALIUtils::debug >= 2) std::cout << "DTAlignmentRcd WRITTEN TO DB : "<< nrcd << std::endl;

nrcd = dt_AlignmentErrors->m_alignError.size();
if ( myDbService->isNewTagRequest( "DTAlignmentErrorRcd" ) ) {
myDbService->createNewIOV<AlignmentErrors>(&(*dt_AlignmentErrors),
if ( myDbService->isNewTagRequest( "DTAlignmentErrorExtendedRcd" ) ) {
myDbService->createNewIOV<AlignmentErrorsExtended>(&(*dt_AlignmentErrors),
myDbService->beginOfTime(),
myDbService->endOfTime(),
"DTAlignmentErrorRcd");
"DTAlignmentErrorExtendedRcd");
} else {
myDbService->appendSinceTime<AlignmentErrors>( &(*dt_AlignmentErrors),
myDbService->appendSinceTime<AlignmentErrorsExtended>( &(*dt_AlignmentErrors),
appendTime,
"DTAlignmentErrorRcd");
"DTAlignmentErrorExtendedRcd");
}
if(ALIUtils::debug >= 2) std::cout << "DTAlignmentErrorRcd WRITTEN TO DB : "<< nrcd << std::endl;
if(ALIUtils::debug >= 2) std::cout << "DTAlignmentErrorExtendedRcd WRITTEN TO DB : "<< nrcd << std::endl;

// Build CSC alignments and errors
std::pair< Alignments*,AlignmentErrors*> cscali = BuildAlignments(0);
std::pair< Alignments*,AlignmentErrorsExtended*> cscali = BuildAlignments(0);
Alignments* csc_Alignments = cscali.first;
AlignmentErrors* csc_AlignmentErrors = cscali.second;
AlignmentErrorsExtended* csc_AlignmentErrors = cscali.second;

// Dump CSC alignments and errors
nrcd = csc_Alignments->m_align.size();
Expand All @@ -153,17 +153,17 @@ bool CocoaDBMgr::DumpCocoaResults()
if(ALIUtils::debug >= 2) std::cout << "CSCAlignmentRcd WRITTEN TO DB : "<< nrcd << std::endl;

nrcd = csc_AlignmentErrors->m_alignError.size();
if ( myDbService->isNewTagRequest( "CSCAlignmentErrorRcd" ) ) {
myDbService->createNewIOV<AlignmentErrors>(&(*csc_AlignmentErrors),
if ( myDbService->isNewTagRequest( "CSCAlignmentErrorExtendedRcd" ) ) {
myDbService->createNewIOV<AlignmentErrorsExtended>(&(*csc_AlignmentErrors),
myDbService->beginOfTime(),
myDbService->endOfTime(),
"CSCAlignmentErrorRcd");
"CSCAlignmentErrorExtendedRcd");
} else {
myDbService->appendSinceTime<AlignmentErrors>( &(*csc_AlignmentErrors),
myDbService->appendSinceTime<AlignmentErrorsExtended>( &(*csc_AlignmentErrors),
appendTime,
"CSCAlignmentErrorRcd");
"CSCAlignmentErrorExtendedRcd");
}
if(ALIUtils::debug >= 2) std::cout << "CSCAlignmentErrorRcd WRITTEN TO DB : "<< nrcd << std::endl;
if(ALIUtils::debug >= 2) std::cout << "CSCAlignmentErrorExtendedRcd WRITTEN TO DB : "<< nrcd << std::endl;

//? gives unreadable error??? std::cout << "@@@@ OPTICALALIGNMENTS WRITTEN TO DB " << *optalign << std::endl;

Expand Down Expand Up @@ -285,10 +285,10 @@ OpticalAlignments* CocoaDBMgr::BuildOpticalAlignments()


//-----------------------------------------------------------------------
std::pair< Alignments*,AlignmentErrors*> CocoaDBMgr::BuildAlignments(bool bDT)
std::pair< Alignments*,AlignmentErrorsExtended*> CocoaDBMgr::BuildAlignments(bool bDT)
{
Alignments* alignments = new Alignments;
AlignmentErrors* alignmentErrors = new AlignmentErrors;
AlignmentErrorsExtended* alignmentErrors = new AlignmentErrorsExtended;

//read
static std::vector< OpticalObject* > optolist = Model::OptOList();
Expand All @@ -302,15 +302,15 @@ std::pair< Alignments*,AlignmentErrors*> CocoaDBMgr::BuildAlignments(bool bDT)
std::cout << " cal fill alignments " << std::endl;
alignments->m_align.push_back( *(GetAlignInfoFromOptO( *ite )));
std::cout << " fill alignments " << std::endl;
// AlignTransformError* err =
// AlignTransformErrorExtended* err =
//GetAlignInfoErrorFromOptO( *ite );
alignmentErrors->m_alignError.push_back(*(GetAlignInfoErrorFromOptO( *ite )));
std::cout << "CocoaDBMgr::BuildAlignments add alignmentError " << alignmentErrors->m_alignError.size() << std::endl;
}
}

if(ALIUtils::debug >= 4) std::cout << "CocoaDBMgr::BuildAlignments end with n alignment " << alignments->m_align.size() << " n alignmentError " << alignmentErrors->m_alignError.size() << std::endl;
return std::pair< Alignments*,AlignmentErrors*>(alignments,alignmentErrors);
return std::pair< Alignments*,AlignmentErrorsExtended*>(alignments,alignmentErrors);
}


Expand All @@ -333,7 +333,7 @@ AlignTransform* CocoaDBMgr::GetAlignInfoFromOptO( OpticalObject* opto )
}

//-----------------------------------------------------------------------
AlignTransformError* CocoaDBMgr::GetAlignInfoErrorFromOptO( OpticalObject* opto )
AlignTransformErrorExtended* CocoaDBMgr::GetAlignInfoErrorFromOptO( OpticalObject* opto )
{
if(ALIUtils::debug >= 3) std::cout << "@@@ CocoaDBMgr::GetAlignInfoErrorFromOptO " << opto->name() << std::endl;

Expand All @@ -347,7 +347,7 @@ AlignTransformError* CocoaDBMgr::GetAlignInfoErrorFromOptO( OpticalObject* opto
1.);
//double(dx*dx), 0., double(dy*dy), 0., 0., double(dz*dz) ) ;
CLHEP::HepSymMatrix errms = asHepMatrix(gerr.matrix());
AlignTransformError* alignError = new AlignTransformError( errms, cmsswID );
AlignTransformErrorExtended* alignError = new AlignTransformErrorExtended( errms, cmsswID );
return alignError;

CLHEP::HepMatrix errm(3,3);
Expand All @@ -368,12 +368,12 @@ std::cout << "@@@ CocoaDBMgr::GetAlignInfoFromOptO errm filled" << opto->name()
// errms.assign(errm);

std::cout << "@@@ CocoaDBMgr::GetAlignInfoFromOptO errms filled " << opto->name() << std::endl;
// AlignTransformError* alignError = new AlignTransformError( errms, cmsswID );
// AlignTransformError* alignError = 0;
// AlignTransformErrorExtended* alignError = new AlignTransformErrorExtended( errms, cmsswID );
// AlignTransformErrorExtended* alignError = 0;

std::cout << alignError << "@@@ CocoaDBMgr::GetAlignInfoFromOptO error built " << opto->name() << std::endl;
//t return alignError;
return (AlignTransformError*)(0);
return (AlignTransformErrorExtended*)(0);
}


4 changes: 2 additions & 2 deletions Alignment/CommonAlignment/interface/Alignable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "Alignment/CommonAlignment/interface/StructureType.h"
#include "DataFormats/DetId/interface/DetId.h"

class AlignmentErrors;
class AlignmentErrorsExtended;
class AlignmentParameters;
class AlignmentPositionError;
class Alignments;
Expand Down Expand Up @@ -186,7 +186,7 @@ class Alignable
virtual Alignments* alignments() const = 0;

/// Return vector of alignment errors
virtual AlignmentErrors* alignmentErrors() const = 0;
virtual AlignmentErrorsExtended* alignmentErrors() const = 0;

/// Return surface deformations, sorted by DetId
AlignmentSurfaceDeformations* surfaceDeformations() const;
Expand Down
2 changes: 1 addition & 1 deletion Alignment/CommonAlignment/interface/AlignableBeamSpot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class AlignableBeamSpot : public Alignable
virtual Alignments* alignments() const;

/// Return vector of alignment errors
virtual AlignmentErrors* alignmentErrors() const;
virtual AlignmentErrorsExtended* alignmentErrors() const;

/// alignment position error - for checking only, otherwise use alignmentErrors() above!
const AlignmentPositionError* alignmentPositionError() const { return theAlignmentPositionError;}
Expand Down
2 changes: 1 addition & 1 deletion Alignment/CommonAlignment/interface/AlignableComposite.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class AlignableComposite : public Alignable
virtual Alignments* alignments() const;

/// Return vector of alignment errors
virtual AlignmentErrors* alignmentErrors() const;
virtual AlignmentErrorsExtended* alignmentErrors() const;

/// Return surface deformations
virtual int surfaceDeformationIdPairs(std::vector<std::pair<int,SurfaceDeformation*> > &) const;
Expand Down
2 changes: 1 addition & 1 deletion Alignment/CommonAlignment/interface/AlignableDet.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class AlignableDet: public AlignableComposite
virtual Alignments* alignments() const;

/// Return vector of alignment errors
virtual AlignmentErrors* alignmentErrors() const;
virtual AlignmentErrorsExtended* alignmentErrors() const;

/// alignment position error - for checking only, otherwise use alignmentErrors() above!
const AlignmentPositionError* alignmentPositionError() const { return theAlignmentPositionError;}
Expand Down
2 changes: 1 addition & 1 deletion Alignment/CommonAlignment/interface/AlignableDetUnit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class AlignableDetUnit : public Alignable
virtual Alignments* alignments() const;

/// Return vector of alignment errors
virtual AlignmentErrors* alignmentErrors() const;
virtual AlignmentErrorsExtended* alignmentErrors() const;

/// Return surface deformations
virtual int surfaceDeformationIdPairs(std::vector<std::pair<int,SurfaceDeformation*> > &) const;
Expand Down
2 changes: 1 addition & 1 deletion Alignment/CommonAlignment/interface/AlignableExtras.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class AlignableExtras
Alignments* alignments() const;

/// Return alignment errors, sorted by DetId
AlignmentErrors* alignmentErrors() const;
AlignmentErrorsExtended* alignmentErrors() const;

void dump(void) const;

Expand Down
10 changes: 5 additions & 5 deletions Alignment/CommonAlignment/src/AlignableBeamSpot.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "Alignment/CommonAlignment/interface/AlignableDetUnit.h"
#include "CondFormats/Alignment/interface/Alignments.h"
#include "CondFormats/Alignment/interface/AlignmentErrors.h"
#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
#include "CLHEP/Vector/RotationInterfaces.h"
#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
Expand Down Expand Up @@ -137,16 +137,16 @@ Alignments* AlignableBeamSpot::alignments() const
}

//__________________________________________________________________________________________________
AlignmentErrors* AlignableBeamSpot::alignmentErrors( void ) const
AlignmentErrorsExtended* AlignableBeamSpot::alignmentErrors( void ) const
{
AlignmentErrors* m_alignmentErrors = new AlignmentErrors();
AlignmentErrorsExtended* m_alignmentErrors = new AlignmentErrorsExtended();

// Add associated alignment position error
uint32_t detId = theId;
CLHEP::HepSymMatrix clhepSymMatrix(3,0);
CLHEP::HepSymMatrix clhepSymMatrix(6,0);
if ( theAlignmentPositionError ) // Might not be set
clhepSymMatrix = asHepMatrix(theAlignmentPositionError->globalError().matrix());
AlignTransformError transformError( clhepSymMatrix, detId );
AlignTransformErrorExtended transformError( clhepSymMatrix, detId );
m_alignmentErrors->m_alignError.push_back( transformError );

return m_alignmentErrors;
Expand Down
12 changes: 6 additions & 6 deletions Alignment/CommonAlignment/src/AlignableComposite.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "CondFormats/Alignment/interface/Alignments.h"
#include "CondFormats/Alignment/interface/AlignmentErrors.h"
#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"

Expand Down Expand Up @@ -312,21 +312,21 @@ Alignments* AlignableComposite::alignments( void ) const


//__________________________________________________________________________________________________
AlignmentErrors* AlignableComposite::alignmentErrors( void ) const
AlignmentErrorsExtended* AlignableComposite::alignmentErrors( void ) const
{

// Recursively call alignmentsErrors, until we get to an AlignableDetUnit
Alignables comp = this->components();

AlignmentErrors* m_alignmentErrors = new AlignmentErrors();
AlignmentErrorsExtended* m_alignmentErrors = new AlignmentErrorsExtended();

// Add components recursively
for ( Alignables::iterator i=comp.begin(); i!=comp.end(); i++ )
{
AlignmentErrors* tmpAlignmentErrors = (*i)->alignmentErrors();
std::copy( tmpAlignmentErrors->m_alignError.begin(), tmpAlignmentErrors->m_alignError.end(),
AlignmentErrorsExtended* tmpAlignmentErrorsExtended = (*i)->alignmentErrors();
std::copy( tmpAlignmentErrorsExtended->m_alignError.begin(), tmpAlignmentErrorsExtended->m_alignError.end(),
std::back_inserter(m_alignmentErrors->m_alignError) );
delete tmpAlignmentErrors;
delete tmpAlignmentErrorsExtended;
}


Expand Down
12 changes: 6 additions & 6 deletions Alignment/CommonAlignment/src/AlignableDet.cc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "Alignment/CommonAlignment/interface/AlignableDetUnit.h"
#include "CondFormats/Alignment/interface/Alignments.h"
#include "CondFormats/Alignment/interface/AlignmentErrors.h"
#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
#include "CLHEP/Vector/RotationInterfaces.h"
#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
Expand Down Expand Up @@ -132,21 +132,21 @@ Alignments* AlignableDet::alignments() const
}

//__________________________________________________________________________________________________
AlignmentErrors* AlignableDet::alignmentErrors( void ) const
AlignmentErrorsExtended* AlignableDet::alignmentErrors( void ) const
{

AlignmentErrors* m_alignmentErrors = new AlignmentErrors();
AlignmentErrorsExtended* m_alignmentErrors = new AlignmentErrorsExtended();

// Add associated alignment position error
uint32_t detId = this->geomDetId().rawId();
CLHEP::HepSymMatrix clhepSymMatrix(3,0);
CLHEP::HepSymMatrix clhepSymMatrix(6,0);
if ( theAlignmentPositionError ) // Might not be set
clhepSymMatrix= asHepMatrix(theAlignmentPositionError->globalError().matrix());
AlignTransformError transformError( clhepSymMatrix, detId );
AlignTransformErrorExtended transformError( clhepSymMatrix, detId );
m_alignmentErrors->m_alignError.push_back( transformError );

// Add those from components
AlignmentErrors *compAlignmentErrs = this->AlignableComposite::alignmentErrors();
AlignmentErrorsExtended *compAlignmentErrs = this->AlignableComposite::alignmentErrors();
std::copy(compAlignmentErrs->m_alignError.begin(), compAlignmentErrs->m_alignError.end(),
std::back_inserter(m_alignmentErrors->m_alignError));
delete compAlignmentErrs;
Expand Down
10 changes: 5 additions & 5 deletions Alignment/CommonAlignment/src/AlignableDetUnit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h"

#include "CondFormats/Alignment/interface/Alignments.h"
#include "CondFormats/Alignment/interface/AlignmentErrors.h"
#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
#include "CLHEP/Vector/RotationInterfaces.h"
#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
#include "Geometry/CommonTopologies/interface/SurfaceDeformation.h"
Expand Down Expand Up @@ -189,18 +189,18 @@ Alignments* AlignableDetUnit::alignments() const


//__________________________________________________________________________________________________
AlignmentErrors* AlignableDetUnit::alignmentErrors() const
AlignmentErrorsExtended* AlignableDetUnit::alignmentErrors() const
{

AlignmentErrors* m_alignmentErrors = new AlignmentErrors();
AlignmentErrorsExtended* m_alignmentErrors = new AlignmentErrorsExtended();

uint32_t detId = this->geomDetId().rawId();

CLHEP::HepSymMatrix clhepSymMatrix(3,0);
CLHEP::HepSymMatrix clhepSymMatrix(6,0);
if ( theAlignmentPositionError ) // Might not be set
clhepSymMatrix = asHepMatrix(theAlignmentPositionError->globalError().matrix());

AlignTransformError transformError( clhepSymMatrix, detId );
AlignTransformErrorExtended transformError( clhepSymMatrix, detId );

m_alignmentErrors->m_alignError.push_back( transformError );

Expand Down
14 changes: 7 additions & 7 deletions Alignment/CommonAlignment/src/AlignableExtras.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "Alignment/CommonAlignment/interface/AlignableBeamSpot.h"

#include "CondFormats/Alignment/interface/Alignments.h"
#include "CondFormats/Alignment/interface/AlignmentErrors.h"
#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
#include "CondFormats/Alignment/interface/AlignmentSorter.h"

#include "Alignment/CommonAlignment/interface/AlignableExtras.h"
Expand Down Expand Up @@ -65,22 +65,22 @@ Alignments* AlignableExtras::alignments( void ) const
}

//__________________________________________________________________________________________________
AlignmentErrors* AlignableExtras::alignmentErrors( void ) const
AlignmentErrorsExtended* AlignableExtras::alignmentErrors( void ) const
{
align::Alignables comp = this->components();
AlignmentErrors* m_alignmentErrors = new AlignmentErrors();
AlignmentErrorsExtended* m_alignmentErrors = new AlignmentErrorsExtended();

// Add components recursively
for ( align::Alignables::iterator i=comp.begin(); i!=comp.end(); i++ )
{
AlignmentErrors* tmpAlignmentErrors = (*i)->alignmentErrors();
std::copy( tmpAlignmentErrors->m_alignError.begin(), tmpAlignmentErrors->m_alignError.end(),
AlignmentErrorsExtended* tmpAlignmentErrorsExtended = (*i)->alignmentErrors();
std::copy( tmpAlignmentErrorsExtended->m_alignError.begin(), tmpAlignmentErrorsExtended->m_alignError.end(),
std::back_inserter(m_alignmentErrors->m_alignError) );
delete tmpAlignmentErrors;
delete tmpAlignmentErrorsExtended;
}

std::sort( m_alignmentErrors->m_alignError.begin(), m_alignmentErrors->m_alignError.end(),
lessAlignmentDetId<AlignTransformError>() );
lessAlignmentDetId<AlignTransformErrorExtended>() );

return m_alignmentErrors;
}
Expand Down
Loading

0 comments on commit 8d7c857

Please sign in to comment.