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

Phase2 he27 #3238

Merged
merged 1 commit into from Apr 8, 2014
Merged

Phase2 he27 #3238

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
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion Geometry/CaloTopology/src/HcalTopology.cc
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
#include <cassert>
#include <algorithm>
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "DataFormats/HcalDetId/interface/HcalDetId.h"
#include "DataFormats/HcalDetId/interface/HcalTrigTowerDetId.h"
#include "DataFormats/HcalDetId/interface/HcalCalibDetId.h"
Expand Down Expand Up @@ -165,6 +166,9 @@ HcalTopology::HcalTopology(HcalTopologyMode::Mode mode, int maxDepthHB, int maxD
}
nEtaHB_ = (lastHBRing_-firstHBRing_+1);
nEtaHE_ = (lastHERing_-firstHERing_+1);

edm::LogWarning("CaloTopology") << "This is an incomplete constructor of HcalTopology - be warned that many functionalities will not be there - revert from this - get from EventSetup";

}

bool HcalTopology::valid(const DetId& id) const {
Expand Down Expand Up @@ -687,7 +691,7 @@ bool HcalTopology::decrementDepth(HcalDetId & detId) const {
mode_ != HcalTopologyMode::SLHC) {
(ieta > 0) ? --ieta : ++ieta;
} else if (depth <= 0) {
if (subdet == HcalEndcap && etaRing == firstHFRing()) {
if (subdet == HcalForward && etaRing == firstHFRing()) {
// overlap
subdet = HcalEndcap;
etaRing= etaHF2HE_;
Expand Down
10 changes: 6 additions & 4 deletions SimG4Core/Geometry/src/DDG4Builder.cc
View file
Open in desktop
Expand Up @@ -51,7 +51,8 @@ G4LogicalVolume * DDG4Builder::convertLV(const DDLogicalPart & part) {
DDG4Dispatchable * disp = new DDG4Dispatchable(&part,result);
theVectorOfDDG4Dispatchables_->push_back(disp);
LogDebug("SimG4CoreGeometry") << "DDG4Builder::convertLV(): new G4LogicalVolume " << part.name().name()
<< "\nDDG4Builder: newEvent: dd=" << part.ddname() << " g4=" << result->GetName();
<< "\nDDG4Builder: newEvent: dd=" << part.ddname() << " g4=" << result->GetName()
<< "\nSolid " << s->GetName() << " Material " << m->GetName();
logs_[part] = result; // DDD -> GEANT4
}
return result;
Expand Down Expand Up @@ -144,13 +145,14 @@ DDGeometryReturnType DDG4Builder::BuildGeometry() {
rm.GetComponents(x, y, z);
if ((x.Cross(y)).Dot(z)<0)
LogDebug("SimG4CoreGeometry") << ">>Reflection encountered: " << gra.edgeData(cit->second)->rot_ ;
LogDebug("SimG4CoreGeometry") << ">>Placement d=" << gra.nodeData(cit->first).ddname()
<< " m=" << ddLP.ddname() << " cp=" << gra.edgeData(cit->second)->copyno_
<< " r=" << gra.edgeData(cit->second)->rot_.ddname() ;
G4ThreeVector tempTran(gra.edgeData(cit->second)->trans_.X(), gra.edgeData(cit->second)->trans_.Y(), gra.edgeData(cit->second)->trans_.Z());
G4Translate3D transl = tempTran;
CLHEP::HepRep3x3 temp( x.X(), x.Y(), x.Z(), y.X(), y.Y(), y.Z(), z.X(), z.Y(), z.Z() ); //matrix representation
CLHEP::HepRotation hr ( temp );
LogDebug("SimG4CoreGeometry") << ">>Placement d=" << gra.nodeData(cit->first).ddname()
<< " m=" << ddLP.ddname() << " cp=" << gra.edgeData(cit->second)->copyno_
<< " r=" << gra.edgeData(cit->second)->rot_.ddname()
<< " t=" << tempTran;

// G3 convention of defining rot-matrices ...
G4Transform3D trfrm = transl * G4Rotate3D(hr.inverse());//.inverse();
Expand Down
12 changes: 4 additions & 8 deletions SimG4Core/PrintGeomInfo/test/python/runSens_cfg.py
View file
Open in desktop
Expand Up @@ -37,14 +37,10 @@

process.EnableFloatingPointExceptions = cms.Service("EnableFloatingPointExceptions")

process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService",
moduleSeeds = cms.PSet(
generator = cms.untracked.uint32(456789),
g4SimHits = cms.untracked.uint32(9876),
VtxSmeared = cms.untracked.uint32(98765432)
),
sourceSeed = cms.untracked.uint32(123456789)
)
process.load("IOMC.RandomEngine.IOMC_cff")
process.RandomNumberGeneratorService.generator.initialSeed = 456789
process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876
process.RandomNumberGeneratorService.VtxSmeared.initialSeed = 123456789

process.load("SimG4Core.Application.g4SimHits_cfi")

Expand Down
12 changes: 4 additions & 8 deletions SimG4Core/PrintGeomInfo/test/python/run_MaterialBudgeInfo_cfg.py
View file
Open in desktop
Expand Up @@ -48,14 +48,10 @@

process.EnableFloatingPointExceptions = cms.Service("EnableFloatingPointExceptions")

process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService",
moduleSeeds = cms.PSet(
generator = cms.untracked.uint32(456789),
g4SimHits = cms.untracked.uint32(9876),
VtxSmeared = cms.untracked.uint32(98765432)
),
sourceSeed = cms.untracked.uint32(123456789)
)
process.load("IOMC.RandomEngine.IOMC_cff")
process.RandomNumberGeneratorService.generator.initialSeed = 456789
process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876
process.RandomNumberGeneratorService.VtxSmeared.initialSeed = 123456789

process.load("SimG4Core.Application.g4SimHits_cfi")

Expand Down
12 changes: 4 additions & 8 deletions SimG4Core/PrintGeomInfo/test/python/run_cfg.py
View file
Open in desktop
Expand Up @@ -46,14 +46,10 @@

process.EnableFloatingPointExceptions = cms.Service("EnableFloatingPointExceptions")

process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService",
moduleSeeds = cms.PSet(
generator = cms.untracked.uint32(456789),
g4SimHits = cms.untracked.uint32(9876),
VtxSmeared = cms.untracked.uint32(98765432)
),
sourceSeed = cms.untracked.uint32(123456789)
)
process.load("IOMC.RandomEngine.IOMC_cff")
process.RandomNumberGeneratorService.generator.initialSeed = 456789
process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876
process.RandomNumberGeneratorService.VtxSmeared.initialSeed = 123456789

process.load("SimG4Core.Application.g4SimHits_cfi")

Expand Down