Skip to content

Commit

Permalink
Change TriggerMode definition
Browse files Browse the repository at this point in the history
  • Loading branch information
Sunanda committed Aug 31, 2016
1 parent 5486c49 commit e7bc2cd
Show file tree
Hide file tree
Showing 19 changed files with 32 additions and 33 deletions.
5 changes: 3 additions & 2 deletions Geometry/CaloTopology/interface/HcalTopology.h
View file
Expand Up @@ -26,7 +26,7 @@ class HcalTopology : public CaloSubdetectorTopology {
public:

HcalTopology(const HcalDDDRecConstants* hcons);
HcalTopology(HcalTopologyMode::Mode mode, int maxDepthHB, int maxDepthHE, HcalTopologyMode::TriggerMode tmode=HcalTopologyMode::tm_LHC_RCT);
HcalTopology(HcalTopologyMode::Mode mode, int maxDepthHB, int maxDepthHE, HcalTopologyMode::TriggerMode tmode=HcalTopologyMode::TriggerMode_2009);

HcalTopologyMode::Mode mode() const {return mode_;}
HcalTopologyMode::TriggerMode triggerMode() const { return triggerMode_; }
Expand Down Expand Up @@ -209,14 +209,15 @@ class HcalTopology : public CaloSubdetectorTopology {
kZDChalf = 11,
kCASTORhalf = 224,
kCALIBhalf = 693,
kHThalfPhase1 = 2520 ,
kHcalhalf = kHBhalf + kHEhalf + kHOhalf + kHFhalf } ;
enum { kSizeForDenseIndexingPreLS1 = 2*kHcalhalf } ;
enum { kHBSizePreLS1 = 2*kHBhalf } ;
enum { kHESizePreLS1 = 2*kHEhalf } ;
enum { kHOSizePreLS1 = 2*kHOhalf } ;
enum { kHFSizePreLS1 = 2*kHFhalf } ;
enum { kHTSizePreLS1 = 2*kHThalf } ;
enum { kHTSizePhase1 = (kHTSizePreLS1+(2*12*36)) } ;
enum { kHTSizePhase1 = 2*kHThalfPhase1 } ;
enum { kCALIBSizePreLS1 = 2*kCALIBhalf };
};

Expand Down
14 changes: 6 additions & 8 deletions Geometry/CaloTopology/src/HcalTopology.cc
View file
Expand Up @@ -63,7 +63,7 @@ HcalTopology::HcalTopology(const HcalDDDRecConstants* hcons) :
numberOfShapes_ = (maxPhiHE_ > 72) ? 1200 : 500;
}
maxEta_ = (lastHERing_ > lastHFRing_) ? lastHERing_ : lastHFRing_;
if (triggerMode_ == HcalTopologyMode::tm_LHC_RCT) {
if (triggerMode_ == HcalTopologyMode::TriggerMode_2009) {
HTSize_ = kHTSizePreLS1;
} else {
HTSize_ = kHTSizePhase1;
Expand Down Expand Up @@ -168,12 +168,10 @@ HcalTopology::HcalTopology(HcalTopologyMode::Mode mode, int maxDepthHB, int maxD
}
nEtaHB_ = (lastHBRing_-firstHBRing_+1);
nEtaHE_ = (lastHERing_-firstHERing_+1);
if (triggerMode_ == HcalTopologyMode::tm_LHC_RCT) {
if (triggerMode_ == HcalTopologyMode::TriggerMode_2009) {
HTSize_ = kHTSizePreLS1;
} else if (triggerMode_ == HcalTopologyMode::tm_LHC_RCT_and_1x1) {
HTSize_ = kHTSizePhase1;
} else {
HTSize_ = kHTSizePhase1-kHTSizePreLS1;
HTSize_ = kHTSizePhase1;
}

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";
Expand Down Expand Up @@ -204,12 +202,12 @@ bool HcalTopology::validHT(const HcalTrigTowerDetId& id) const {
if (id.iphi()<1 || id.iphi()>IPHI_MAX || id.ieta()==0) return false;
if (id.depth() != 0) return false;
if (id.version()==0) {
if ((triggerMode_==HcalTopologyMode::tm_LHC_1x1 && id.ietaAbs()>28) ||
if ((triggerMode_==HcalTopologyMode::TriggerMode_2017 && id.ietaAbs()>28) ||
(id.ietaAbs()>32)) return false;
int ietaMax = (triggerMode_==HcalTopologyMode::tm_LHC_1x1) ? 29 : 28;
int ietaMax = (triggerMode_==HcalTopologyMode::TriggerMode_2017) ? 29 : 28;
if (id.ietaAbs()>ietaMax && ((id.iphi()%4)!=1)) return false;
} else {
if (triggerMode_==HcalTopologyMode::tm_LHC_RCT) return false;
if (triggerMode_==HcalTopologyMode::TriggerMode_2009) return false;
if (id.ietaAbs()<30 || id.ietaAbs()>41) return false;
if (id.ietaAbs()>29 && ((id.iphi()%2)==0)) return false;
if (id.ietaAbs()>39 && ((id.iphi()%4)!=3)) return false;
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml
View file
Expand Up @@ -38,7 +38,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::LHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_RCT" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2009" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/PhaseI/hcalRecNumbering.xml
View file
Expand Up @@ -35,7 +35,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2017" eval="false"/>
</SpecPar>
</SpecParSection>

Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/PhaseII/HGCal/hcalRecNumbering.xml
View file
Expand Up @@ -34,7 +34,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2017" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/PhaseII/HGCal/hcalRecNumberingRebuild.xml
View file
Expand Up @@ -28,7 +28,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2017" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/PhaseII/NoHE/hcalRecNumbering.xml
View file
Expand Up @@ -21,7 +21,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2017" eval="false"/>
</SpecPar>
</SpecParSection>

Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/PhaseII/hcalRecNumbering.xml
View file
Expand Up @@ -28,7 +28,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2017" eval="false"/>
</SpecPar>
</SpecParSection>

Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingEta4.xml
View file
Expand Up @@ -32,7 +32,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2017" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuild.xml
View file
Expand Up @@ -36,7 +36,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2017" eval="false"/>
</SpecPar>
</SpecParSection>

Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuildHE.xml
View file
Expand Up @@ -37,7 +37,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2017" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/Run2/hcalRecNumbering.xml
View file
Expand Up @@ -38,7 +38,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::LHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_RCT" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2009" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/Run2/hcalRecNumbering16.xml
View file
Expand Up @@ -38,7 +38,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_RCT_and_1x1" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2016" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/Run2/hcalRecNumbering16a.xml
View file
Expand Up @@ -38,7 +38,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::LHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_RCT_and_1x1" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2016" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/Run2/hcalRecNumbering17.xml
View file
Expand Up @@ -38,7 +38,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2017" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
8 changes: 4 additions & 4 deletions Geometry/HcalCommonData/interface/HcalTopologyMode.h
View file
Expand Up @@ -27,10 +27,10 @@ namespace HcalTopologyMode {
enum Mode { LHC=0, H2=1, SLHC=2, H2HE=3 };

enum TriggerMode {
tm_LHC_RCT=0, // HF is summed in 3x2 regions
tm_LHC_RCT_and_1x1=1, // HF is summed in both 3x2 and 1x1 regions
tm_LHC_1x1=2 // HF is summed in 1x1 regions
TriggerMode_2009=0, // HF is summed in 3x2 regions
TriggerMode_2016=1, // HF is summed in both 3x2 and 1x1 regions
TriggerMode_2017=2 // HF is summed in 1x1 regions
};
}

#endif // CALO_TOPOLOGY_HCAL_TOPOLOGY_MODE_H
#endif // Geometry_HcalCommonData_HcalTopologyMode_H
6 changes: 3 additions & 3 deletions Geometry/HcalCommonData/src/HcalTopologyMode.cc
View file
Expand Up @@ -10,7 +10,7 @@ StringToEnumParser<HcalTopologyMode::Mode>::StringToEnumParser() {

template<>
StringToEnumParser<HcalTopologyMode::TriggerMode>::StringToEnumParser() {
enumMap["HcalTopologyMode::tm_LHC_RCT"] = HcalTopologyMode::tm_LHC_RCT;
enumMap["HcalTopologyMode::tm_LHC_RCT_and_1x1"] = HcalTopologyMode::tm_LHC_RCT_and_1x1;
enumMap["HcalTopologyMode::tm_LHC_1x1"] = HcalTopologyMode::tm_LHC_1x1;
enumMap["HcalTopologyMode::TriggerMode_2009"] = HcalTopologyMode::TriggerMode_2009;
enumMap["HcalTopologyMode::TriggerMode_2016"] = HcalTopologyMode::TriggerMode_2016;
enumMap["HcalTopologyMode::TriggerMode_2017"] = HcalTopologyMode::TriggerMode_2017;
}
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/test/python/runHcalParametersFromDDAnalyzer_cfg.py
View file
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms
process = cms.Process("HcalParametersTest")

process.load('Configuration.Geometry.GeometryExtended2023D3_cff')
process.load('Geometry.HcalCommonData.testPhase2GeometryFineXML_cfi')
process.load('Geometry.HcalCommonData.hcalParameters_cfi')

process.source = cms.Source("EmptySource")
Expand Down
4 changes: 2 additions & 2 deletions Geometry/HcalTowerAlgo/plugins/HcalTrigTowerGeometryESProducer.cc
View file
Expand Up @@ -20,8 +20,8 @@ HcalTrigTowerGeometryESProducer::produce( const CaloGeometryRecord & iRecord )

m_hcalTrigTowerGeom = std::make_shared<HcalTrigTowerGeometry>( &*hcalTopology);
HcalTopologyMode::TriggerMode tmode=hcalTopology->triggerMode();
bool enableRCTHF=(tmode==HcalTopologyMode::tm_LHC_RCT || tmode==HcalTopologyMode::tm_LHC_RCT_and_1x1);
bool enable1x1HF=(tmode==HcalTopologyMode::tm_LHC_1x1 || tmode==HcalTopologyMode::tm_LHC_RCT_and_1x1);
bool enableRCTHF=(tmode==HcalTopologyMode::TriggerMode_2009 || tmode==HcalTopologyMode::TriggerMode_2016);
bool enable1x1HF=(tmode==HcalTopologyMode::TriggerMode_2016 || tmode==HcalTopologyMode::TriggerMode_2017);
m_hcalTrigTowerGeom->setupHFTowers(enableRCTHF,enable1x1HF);

return m_hcalTrigTowerGeom;
Expand Down

0 comments on commit e7bc2cd

Please sign in to comment.