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.

Sign up for GitHub

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

Revert "Merge by hand 7_3_X into 7_3_ROOT6_X" #5991

Merged
merged 1 commit into from Oct 24, 2014
Merged

Revert "Merge by hand 7_3_X into 7_3_ROOT6_X" #5991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBiasHI_cff.py
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
ALCARECOTkAlMinBiasHIDCSFilter = ALCARECOTkAlMinBiasDCSFilter.clone()

ALCARECOTkAlMinBiasHI = ALCARECOTkAlMinBias.clone(
src = 'hiGeneralTracks'
src = 'hiSelectedTracks'
)

seqALCARECOTkAlMinBiasHI = cms.Sequence(ALCARECOTkAlMinBiasHIHLT+ALCARECOTkAlMinBiasHIDCSFilter+ALCARECOTkAlMinBiasHI)
16 changes: 8 additions & 8 deletions Alignment/HIPAlignmentAlgorithm/src/LhcTrackAnalyzer.cc
View file
Open in desktop
Expand Up @@ -162,14 +162,14 @@ LhcTrackAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
int myalgo=-88;
if(track->algo()==reco::TrackBase::undefAlgorithm)myalgo=0;
if(track->algo()==reco::TrackBase::ctf)myalgo=1;
if(track->algo()==reco::TrackBase::initialStep)myalgo=4;
if(track->algo()==reco::TrackBase::lowPtTripletStep)myalgo=5;
if(track->algo()==reco::TrackBase::pixelPairStep)myalgo=6;
if(track->algo()==reco::TrackBase::detachedTripletStep)myalgo=7;
if(track->algo()==reco::TrackBase::mixedTripletStep)myalgo=8;
if(track->algo()==reco::TrackBase::pixelLessStep)myalgo=9;
if(track->algo()==reco::TrackBase::tobTecStep)myalgo=10;
if(track->algo()==reco::TrackBase::jetCoreRegionalStep)myalgo=11;
if(track->algo()==reco::TrackBase::iter0)myalgo=4;
if(track->algo()==reco::TrackBase::iter1)myalgo=5;
if(track->algo()==reco::TrackBase::iter2)myalgo=6;
if(track->algo()==reco::TrackBase::iter3)myalgo=7;
if(track->algo()==reco::TrackBase::iter4)myalgo=8;
if(track->algo()==reco::TrackBase::iter5)myalgo=9;
if(track->algo()==reco::TrackBase::iter6)myalgo=10;
if(track->algo()==reco::TrackBase::iter7)myalgo=11;
trkAlgo_[nTracks_] = myalgo;

int myquality=-99;
Expand Down
7 changes: 2 additions & 5 deletions ...ty/test/SiPixelFedCablingMapWriter_cfg.py → ...ker/SiPixelConnectivity/test/write_cfg.py
View file
Open in desktop
Expand Up @@ -5,11 +5,8 @@
process.CondDBCommon.connect = cms.string("sqlite_file:cabling.db")

process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
from Configuration.AlCa.autoCond_condDBv2 import autoCond
process.GlobalTag.globaltag = autoCond['run2_design']
#In case you of conditions missing, or if you want to test a specific GT
#process.GlobalTag.globaltag = 'PRE_DES72_V6'
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = 'MC_3XY_V15::All'

process.source = cms.Source("EmptyIOVSource",
timetype = cms.string('runnumber'),
Expand Down
2 changes: 1 addition & 1 deletion Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasHI_cff.py
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
ALCARECOSiStripCalMinBias = Alignment.CommonAlignmentProducer.AlignmentTrackSelector_cfi.AlignmentTrackSelector.clone()

ALCARECOSiStripCalMinBias.filter = True ##do not store empty events
ALCARECOSiStripCalMinBias.src = 'hiGeneralTracks'
ALCARECOSiStripCalMinBias.src = 'hiSelectedTracks'
ALCARECOSiStripCalMinBias.applyBasicCuts = True
ALCARECOSiStripCalMinBias.ptMin = 0.8 ##GeV
ALCARECOSiStripCalMinBias.nHitMin = 6 ## at least 6 hits required
Expand Down
2 changes: 1 addition & 1 deletion Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducer_cfi.py
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
MinimumTotalLayers = cms.untracked.int32(11),
MinimumPixelLayers = cms.untracked.int32(3),
MaximumNormChi2 = cms.untracked.double(2.0),
TrackAlgorithm = cms.untracked.vstring('initialStep'), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
TrackAlgorithm = cms.untracked.vstring('iter0'), ## ctf,rs,cosmics,iter0,iter1...; for all algos, leave it blank
TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
InputBeamWidth = cms.untracked.double(-1.0), ## if -1 use the value calculated by the analyzer
FractionOfFittedTrks = cms.untracked.double(0.9),
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/Utils/test/testExpressionParser.cc
View file
Open in desktop
Expand Up @@ -138,7 +138,7 @@ void testExpressionParser::checkAll() {
edm::TestHandle<reco::TrackExtraCollection> h(&trkExtras, pid);
reco::TrackExtraRef trkExtraRef(h, 0);
trk.setExtra(trkExtraRef);
trk.setAlgorithm(reco::Track::pixelPairStep);
trk.setAlgorithm(reco::Track::iter2);
{
edm::TypeWithDict t(typeid(reco::Track));
o = edm::ObjectWithDict(t, & trk);
Expand All @@ -152,7 +152,7 @@ void testExpressionParser::checkAll() {
checkTrack("hitPattern.numberOfValidHits", trk.hitPattern().numberOfValidHits());
checkTrack("extra.outerPhi", trk.extra()->outerPhi());
checkTrack("referencePoint.R", trk.referencePoint().R());
checkTrack("algo", reco::Track::pixelPairStep);
checkTrack("algo", reco::Track::iter2);
checkTrack("quality('highPurity')", trk.quality(reco::TrackBase::highPurity));
checkTrack("cosh(theta)", cosh(trk.theta()));
checkTrack("hypot(px, py)", hypot(trk.px(), trk.py()));
Expand Down
5 changes: 0 additions & 5 deletions CondCore/CondDB/interface/ConnectionPool.h
View file
Open in desktop
Expand Up @@ -14,7 +14,6 @@ namespace edm {

namespace coral {
class IConnectionServiceConfiguration;
class ISessionProxy;
}

namespace cond {
Expand Down Expand Up @@ -42,12 +41,8 @@ namespace cond {
void configure();
Session createSession( const std::string& connectionString, bool writeCapable=false, BackendType backType=DEFAULT_DB );
Session createReadOnlySession( const std::string& connectionString, const std::string& transactionId );
boost::shared_ptr<coral::ISessionProxy> createCoralSession( const std::string& connectionString, bool writeCapable=false );

private:
boost::shared_ptr<coral::ISessionProxy> createCoralSession( const std::string& connectionString,
const std::string& transactionId,
bool writeCapable=false );
Session createSession( const std::string& connectionString,
const std::string& transactionId,
bool writeCapable=false,
Expand Down
33 changes: 3 additions & 30 deletions CondCore/CondDB/src/ConnectionPool.cc
View file
Open in desktop
Expand Up @@ -132,28 +132,6 @@ namespace cond {
configure( connServ.configuration() );
}

boost::shared_ptr<coral::ISessionProxy> ConnectionPool::createCoralSession( const std::string& connectionString,
const std::string& transactionId,
bool writeCapable ){
coral::ConnectionService connServ;
std::pair<std::string,std::string> fullConnectionPars = getConnectionParams( connectionString, transactionId );
if( !fullConnectionPars.second.empty() ) {
// the olds formats
connServ.webCacheControl().refreshTable( fullConnectionPars.second, POOL_IOV_TABLE_DATA );
connServ.webCacheControl().refreshTable( fullConnectionPars.second, ORA_IOV_TABLE_1 );
connServ.webCacheControl().refreshTable( fullConnectionPars.second, ORA_IOV_TABLE_2 );
connServ.webCacheControl().refreshTable( fullConnectionPars.second, ORA_IOV_TABLE_3 );
// the new schema...
connServ.webCacheControl().setTableTimeToLive( fullConnectionPars.second, TAG::tname, 1 );
connServ.webCacheControl().setTableTimeToLive( fullConnectionPars.second, IOV::tname, 1 );
connServ.webCacheControl().setTableTimeToLive( fullConnectionPars.second, PAYLOAD::tname, 3 );
}

return boost::shared_ptr<coral::ISessionProxy>( connServ.connect( fullConnectionPars.first,
writeCapable?Auth::COND_WRITER_ROLE:Auth::COND_READER_ROLE,
writeCapable?coral::Update:coral::ReadOnly ) );
}

Session ConnectionPool::createSession( const std::string& connectionString,
const std::string& transactionId,
bool writeCapable,
Expand All @@ -172,8 +150,9 @@ namespace cond {
connServ.webCacheControl().setTableTimeToLive( fullConnectionPars.second, PAYLOAD::tname, 3 );
}

boost::shared_ptr<coral::ISessionProxy> coralSession = createCoralSession( connectionString, transactionId, writeCapable );

boost::shared_ptr<coral::ISessionProxy> coralSession( connServ.connect( fullConnectionPars.first,
writeCapable?Auth::COND_WRITER_ROLE:Auth::COND_READER_ROLE,
writeCapable?coral::Update:coral::ReadOnly ) );
BackendType bt;
auto it = m_dbTypes.find( connectionString);
if( it == m_dbTypes.end() ){
Expand All @@ -195,12 +174,6 @@ namespace cond {
Session ConnectionPool::createReadOnlySession( const std::string& connectionString, const std::string& transactionId ){
return createSession( connectionString, transactionId );
}

boost::shared_ptr<coral::ISessionProxy> ConnectionPool::createCoralSession( const std::string& connectionString,
bool writeCapable ){
return createCoralSession( connectionString, "", writeCapable );
}

void ConnectionPool::setMessageVerbosity( coral::MsgLevel level ){
m_messageLevel = level;
}
Expand Down
22 changes: 6 additions & 16 deletions CondCore/CondDB/src/OraDbSchema.cc
View file
Open in desktop
Expand Up @@ -233,29 +233,19 @@ namespace cond {
const boost::posix_time::ptime& ){
if(!m_cache.load(tag)) throwException("Tag "+tag+" has not been found in the database.",
"OraIOVTable::insertOne");
if( m_cache.editor().timetype() != cond::hash ){
m_cache.editor().append( since, payloadHash );
} else {
m_cache.editor().freeInsert( since, payloadHash );
}
m_cache.editor().append( since, payloadHash );
}

void OraIOVTable::insertMany( const std::string& tag,
const std::vector<std::tuple<cond::Time_t,cond::Hash,boost::posix_time::ptime> >& iovs ){
if(!m_cache.load(tag)) throwException("Tag "+tag+" has not been found in the database.",
"OraIOVTable::insertOne");
if( m_cache.editor().timetype() != cond::hash ){
std::vector<std::pair<cond::Time_t, std::string > > data;
data.reserve( iovs.size() );
for( auto v : iovs ){
data.push_back( std::make_pair( std::get<0>(v), std::get<1>(v) ) );
}
m_cache.editor().bulkAppend( data );
} else {
for( auto v: iovs ){
insertOne( tag, std::get<0>(v), std::get<1>(v), std::get<2>(v) );
}
std::vector<std::pair<cond::Time_t, std::string > > data;
data.reserve( iovs.size() );
for( auto v : iovs ){
data.push_back( std::make_pair( std::get<0>(v), std::get<1>(v) ) );
}
m_cache.editor().bulkAppend( data );
}

void OraIOVTable::erase( const std::string& ){
Expand Down
1 change: 1 addition & 0 deletions CondCore/CondDB/src/Session.cc
View file
Open in desktop
Expand Up @@ -253,6 +253,7 @@ namespace cond {

std::string Session::parsePoolToken( const std::string& poolToken ){
m_session->openIovDb();
//std::cout <<"## parsing pool token="<<poolToken<<std::endl;
return m_session->iovSchema().parsePoolToken( poolToken );
}

Expand Down
16 changes: 8 additions & 8 deletions CondCore/DBOutputService/interface/PoolDBOutputService.h
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@
#define CondCore_PoolDBOutputService_h
#include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
#include "FWCore/Utilities/interface/TypeID.h"
#include "CondCore/DBCommon/interface/Logger.h"
#include "CondCore/DBCommon/interface/LogDBEntry.h"
//#include "CondCore/DBCommon/interface/Logger.h"
//#include "CondCore/DBCommon/interface/LogDBEntry.h"
//#include "CondCore/DBCommon/interface/TagInfo.h"
#include "CondCore/CondDB/interface/Session.h"
#include <string>
Expand Down Expand Up @@ -51,7 +51,7 @@ namespace cond{
//
std::string tag( const std::string& recordName );
bool isNewTagRequest( const std::string& recordName );
const cond::Logger& queryLog() const;
//const cond::Logger& queryLog() const;

//
template<typename T>
Expand Down Expand Up @@ -190,7 +190,7 @@ namespace cond{
void initDB( bool forReading=true );

Record & lookUpRecord(const std::string& recordName);
cond::UserLogInfo& lookUpUserLogInfo(const std::string& recordName);
//cond::UserLogInfo& lookUpUserLogInfo(const std::string& recordName);

private:
std::recursive_mutex m_mutex;
Expand All @@ -199,14 +199,14 @@ namespace cond{
std::vector<cond::Time_t> m_currentTimes;

cond::persistency::Session m_session;
std::string m_logConnectionString;
std::auto_ptr<cond::Logger> m_logdb;
//std::string m_logConnectionString;
//std::auto_ptr<cond::Logger> m_logdb;
bool m_dbstarted;

std::map<std::string, Record> m_callbacks;
std::vector< std::pair<std::string,std::string> > m_newtags;
//std::vector< std::pair<std::string,std::string> > m_newtags;
bool m_closeIOV;
std::map<std::string, cond::UserLogInfo> m_logheaders;
//std::map<std::string, cond::UserLogInfo> m_logheaders;

};//PoolDBOutputService
}//ns service
Expand Down