Skip to content

use uint32 to index hits [do not merge] #474

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

Closed
VinInn wants to merge 5 commits into from
Closed

use uint32 to index hits [do not merge] #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ab05a6
increase maxhit, count forlon doublets
VinInn Jun 6, 2020
21d4bb4
fix hit index in phi binner
VinInn Jun 7, 2020
97adcaf
Synchronise with CMSSW_11_2_X_2020-08-28-1100
fwyzard Aug 28, 2020
c3b3d8c
Remove misleading calls to std::move (#546)
fwyzard Sep 1, 2020
fd3168c
Merge branch 'master' into Hit32
VinInn Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Alignment/APEEstimation/python/TrackRefitter_38T_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Geometry.GeometryRecoDB_cff import *
from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag
from Configuration.AlCa.GlobalTag import GlobalTag
from Configuration.StandardSequences.MagneticField_cff import *
from RecoVertex.BeamSpotProducer.BeamSpot_cfi import *

Expand Down
4 changes: 2 additions & 2 deletions Alignment/APEEstimation/test/testApeestimator_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@
##
process.load("Alignment.APEEstimation.TrackRefitter_38T_cff")

process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff')
from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.GlobalTag import GlobalTag
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_design', '')


Expand Down
25 changes: 7 additions & 18 deletions CUDADataFormats/BeamSpot/interface/BeamSpotCUDA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,31 @@

#include <cuda_runtime.h>

#include "DataFormats/BeamSpot/interface/BeamSpotPOD.h"
#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"

class BeamSpotCUDA {
public:
// align to the CUDA L1 cache line size
struct alignas(128) Data {
float x, y, z; // position
// TODO: add covariance matrix

float sigmaZ;
float beamWidthX, beamWidthY;
float dxdz, dydz;
float emittanceX, emittanceY;
float betaStar;
};

// default constructor, required by cms::cuda::Product<BeamSpotCUDA>
BeamSpotCUDA() = default;

// constructor that allocates cached device memory on the given CUDA stream
BeamSpotCUDA(cudaStream_t stream) { data_d_ = cms::cuda::make_device_unique<Data>(stream); }
BeamSpotCUDA(cudaStream_t stream) { data_d_ = cms::cuda::make_device_unique<BeamSpotPOD>(stream); }

// movable, non-copiable
BeamSpotCUDA(BeamSpotCUDA const&) = delete;
BeamSpotCUDA(BeamSpotCUDA&&) = default;
BeamSpotCUDA& operator=(BeamSpotCUDA const&) = delete;
BeamSpotCUDA& operator=(BeamSpotCUDA&&) = default;

Data* data() { return data_d_.get(); }
Data const* data() const { return data_d_.get(); }
BeamSpotPOD* data() { return data_d_.get(); }
BeamSpotPOD const* data() const { return data_d_.get(); }

cms::cuda::device::unique_ptr<Data>& ptr() { return data_d_; }
cms::cuda::device::unique_ptr<Data> const& ptr() const { return data_d_; }
cms::cuda::device::unique_ptr<BeamSpotPOD>& ptr() { return data_d_; }
cms::cuda::device::unique_ptr<BeamSpotPOD> const& ptr() const { return data_d_; }

private:
cms::cuda::device::unique_ptr<Data> data_d_;
cms::cuda::device::unique_ptr<BeamSpotPOD> data_d_;
};

#endif // CUDADataFormats_BeamSpot_interface_BeamSpotCUDA_h
2 changes: 1 addition & 1 deletion CUDADataFormats/SiPixelDigi/src/SiPixelDigiErrorsCUDA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ SiPixelDigiErrorsCUDA::HostDataError SiPixelDigiErrorsCUDA::dataErrorToHostAsync
}
auto err = *error_h;
err.set_data(data.get());
return HostDataError(std::move(err), std::move(data));
return HostDataError(err, std::move(data));
}
2 changes: 1 addition & 1 deletion CUDADataFormats/Track/interface/PixelTrackHeterogeneous.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class TrackSoAT {
static constexpr int32_t stride() { return S; }

using Quality = trackQuality::Quality;
using hindex_type = uint16_t;
using hindex_type = uint32_t;
using HitContainer = cms::cuda::OneToManyAssoc<hindex_type, S, 5 * S>;

// Always check quality is at least loose!
Expand Down
10 changes: 6 additions & 4 deletions CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DSOAView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ namespace pixelCPEforGPU {
class TrackingRecHit2DSOAView {
public:
static constexpr uint32_t maxHits() { return gpuClustering::MaxNumClusters; }
using hindex_type = uint16_t; // if above is <=2^16
using hindex_type = uint32_t; // if above is <=2^32

using Hist =
cms::cuda::HistoContainer<int16_t, 128, gpuClustering::MaxNumClusters, 8 * sizeof(int16_t), uint16_t, 10>;
using PhiBinner =
cms::cuda::HistoContainer<int16_t, 128, gpuClustering::MaxNumClusters, 8 * sizeof(int16_t), hindex_type, 10>;

using Hist = PhiBinner; // FIXME

using AverageGeometry = phase1PixelTopology::AverageGeometry;

Expand Down Expand Up @@ -93,7 +95,7 @@ class TrackingRecHit2DSOAView {

uint32_t* m_hitsLayerStart;

Hist* m_hist;
PhiBinner * m_hist; // FIXME use a more descriptive name consistently

uint32_t m_nHits;
};
Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/EcalTPGTools/test/produceTPGParameters_beamv6_2021_235fb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
)

process.load("CondCore.CondDB.CondDB_cfi")
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff')
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.GlobalTag import GlobalTag
process.GlobalTag = GlobalTag(process.GlobalTag, '101X_postLS2_realistic_v6', '')

Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtDQMClientAlca_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class config: pass

process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ""

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtDQMClient_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class config: pass
fileMode = cms.untracked.string(config.fileMode)
)

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("Configuration.StandardSequences.GeometryDB_cff")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtNoiseCalibration_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/DTCalibration/python/dtT0AbsoluteReferenceCorrection_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
process.load("CalibMuon.DTCalibration.messageLoggerDebug_cff")
process.MessageLogger.debugModules = cms.untracked.vstring('dtT0AbsoluteReferenceCorrection')

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

#process.load("Configuration.StandardSequences.GeometryDB_cff")
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
#process.GlobalTag.globaltag = ''
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtT0Analyzer_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

process = cms.Process("DTT0Analyzer")

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("Configuration.StandardSequences.GeometryDB_cff")
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/DTCalibration/python/dtT0FEBPathCorrection_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
process.load("CalibMuon.DTCalibration.messageLoggerDebug_cff")
process.MessageLogger.debugModules = cms.untracked.vstring('dtT0FEBPathCorrection')

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

#process.load("Configuration.StandardSequences.GeometryDB_cff")
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
#process.GlobalTag.globaltag = ''
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
Expand Down
6 changes: 1 addition & 5 deletions CalibMuon/DTCalibration/python/dtT0FillChamberFromDBCorrection_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@
process.load("CalibMuon.DTCalibration.messageLoggerDebug_cff")
process.MessageLogger.debugModules = cms.untracked.vstring('dtT0FillChamberFromDBCorrection')

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

#process.load("Configuration.StandardSequences.GeometryDB_cff")
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
#process.GlobalTag.globaltag = ''
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Geometry.DTGeometry.dtGeometry_cfi")
Expand Down
6 changes: 1 addition & 5 deletions CalibMuon/DTCalibration/python/dtT0FillDefaultFromDBCorrection_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@
process.load("CalibMuon.DTCalibration.messageLoggerDebug_cff")
process.MessageLogger.debugModules = cms.untracked.vstring('dtT0FillDefaultFromDBCorrection')

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

#process.load("Configuration.StandardSequences.GeometryDB_cff")
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
#process.GlobalTag.globaltag = ''
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Geometry.DTGeometry.dtGeometry_cfi")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtT0WireCalibration_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ""

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/DTCalibration/python/dtT0WireInChamberReferenceCorrection_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
process.load("CalibMuon.DTCalibration.messageLoggerDebug_cff")
process.MessageLogger.debugModules = cms.untracked.vstring('dtT0WireInChamberReferenceCorrection')

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

#process.load("Configuration.StandardSequences.GeometryDB_cff")
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
#process.GlobalTag.globaltag = ''
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtTPAnalyzer_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ""

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtTPDQM_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ""

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/DTCalibration/python/dtTPDeadWriter_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
process = cms.Process("DTTPDeadWriter")

#process.load("Configuration.StandardSequences.GeometryDB_cff")
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
#process.GlobalTag.globaltag = ''

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("Configuration.StandardSequences.GeometryDB_cff")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtTTrigConstantShiftCorrection_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtTTrigCorrection_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtTTrigResidualCorrection_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtTTrigValidSummary_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
resolution = cms.untracked.PSet(limit = cms.untracked.int32(-1))
)

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("Configuration.StandardSequences.GeometryDB_cff")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtTTrigWriter_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

process = cms.Process("PROD")

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("Configuration.StandardSequences.GeometryDB_cff")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtVDriftMeanTimerWriter_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dtVDriftSegmentWriter_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from Configuration.StandardSequences.GeometryDB_cff import *
from Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff import *
from Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff import *
from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import *
from CondCore.CondDB.CondDB_cfi import *

from RecoLocalMuon.Configuration.RecoLocalMuon_cff import *
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cosmics_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from Configuration.StandardSequences.GeometryDB_cff import *
from Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff import *
from Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff import *
from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import *
from CondCore.CondDB.CondDB_cfi import *

from RecoLocalMuon.Configuration.RecoLocalMuonCosmics_cff import *
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cosmics_vDriftSeg_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from Configuration.StandardSequences.GeometryDB_cff import *
from Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff import *
from Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff import *
from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import *
from CondCore.CondDB.CondDB_cfi import *

from RecoLocalMuon.Configuration.RecoLocalMuonCosmics_cff import *
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_t0Seg_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from Configuration.StandardSequences.GeometryDB_cff import *
from Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff import *
from Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff import *
from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import *
from CondCore.CondDB.CondDB_cfi import *

from RecoLocalMuon.Configuration.RecoLocalMuon_cff import *
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_vDriftSeg_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from Configuration.StandardSequences.GeometryDB_cff import *
from Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff import *
from Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff import *
from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import *
from CondCore.CondDB.CondDB_cfi import *

from RecoLocalMuon.Configuration.RecoLocalMuon_cff import *
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dumpDBToFile_GT_ttrig_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

process.load("CondCore.CondDB.CondDB_cfi")

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/python/dumpDBToFile_GT_vdrift_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

process = cms.Process("DumpDBToFile")

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = ''

process.load("CondCore.CondDB.CondDB_cfi")
Expand Down
Loading