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

Thread safe access to HCAL conditions containers #6060

Merged
merged 5 commits into from Oct 31, 2014
Merged

Thread safe access to HCAL conditions containers #6060

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
5cbf1e5
Make setTopo non-const to fix thread safety problems
Dr15Jones Oct 28, 2014
2771cfb
Make access to HCAL conditions thread safe
Dr15Jones Oct 28, 2014
4257768
Use thread-safe access to HCAL containers
Dr15Jones Oct 28, 2014
46fa410
CaloTPGTranscoderULUTs needs own copy of HcalLutMetadata
Dr15Jones Oct 30, 2014
d6f71a1
Use the copy of HcalLutMetadata not the original from the EventSetup
Dr15Jones Oct 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc
View file
Open in desktop
Expand Up @@ -150,9 +150,14 @@ CaloTPGTranscoderULUTs::produce(const CaloTPGRecord& iRecord)
edm::ESHandle<HcalTrigTowerGeometry> theTrigTowerGeometry;
iRecord.getRecord<CaloGeometryRecord>().get(theTrigTowerGeometry);

edm::ESHandle<HcalTopology> htopo;
iRecord.getRecord<HcalLutMetadataRcd>().getRecord<IdealGeometryRecord>().get(htopo);

HcalLutMetadata fullLut{ *lutMetadata };
fullLut.setTopo(htopo.product());

std::auto_ptr<CaloTPGTranscoderULUT> pTCoder(new CaloTPGTranscoderULUT(file1, file2));
pTCoder->setup(*lutMetadata, *theTrigTowerGeometry);
pTCoder->setup(fullLut, *theTrigTowerGeometry);
return std::auto_ptr<CaloTPGTranscoder>( pTCoder );
}

Expand Down
1 change: 1 addition & 0 deletions CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc
View file
Open in desktop
@@ -1,5 +1,6 @@
#include "CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "Geometry/HcalTowerAlgo/interface/HcalTrigTowerGeometry.h"
#include "Geometry/Records/interface/CaloGeometryRecord.h"
#include "FWCore/Utilities/interface/Exception.h"
Expand Down
1 change: 1 addition & 0 deletions CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h
View file
Open in desktop
@@ -1,6 +1,7 @@
#ifndef CALOTPGTRANSCODERULUT_H
#define CALOTPGTRANSCODERULUT_H 1

#include <memory>
#include <vector>
#include "CalibFormats/CaloTPG/interface/CaloTPGTranscoder.h"

Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/HcalAlgos/interface/HcalPulseShapes.h
View file
Open in desktop
Expand Up @@ -45,9 +45,9 @@ class HcalPulseShapes {
Shape hpdShape_v2, hpdShapeMC_v2;
Shape hpdShape_v3, hpdShapeMC_v3;
Shape hpdBV30Shape_v2, hpdBV30ShapeMC_v2;
const HcalMCParams * theMCParams;
HcalMCParams * theMCParams;
const HcalTopology * theTopology;
const HcalRecoParams * theRecoParams;
HcalRecoParams * theRecoParams;
typedef std::map<int, const Shape *> ShapeMap;
ShapeMap theShapes;

Expand Down