diff --git a/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp3.cc b/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp3.cc index 6063cddd8de5a..d648de1dbb690 100644 --- a/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp3.cc +++ b/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp3.cc @@ -80,6 +80,8 @@ class HGCalTriggerGeomTesterV9Imp3 : public edm::stream::EDAnalyzer<> { float moduleX_ = 0; float moduleY_ = 0; float moduleZ_ = 0; + float moduleEta_ = 0; + float modulePhi_ = 0; int moduleTC_N_ = 0; int moduleLinks_ = 0; std::shared_ptr moduleTC_id_; @@ -95,6 +97,8 @@ class HGCalTriggerGeomTesterV9Imp3 : public edm::stream::EDAnalyzer<> { std::shared_ptr moduleTC_x_; std::shared_ptr moduleTC_y_; std::shared_ptr moduleTC_z_; + std::shared_ptr moduleTC_eta_; + std::shared_ptr moduleTC_phi_; int moduleCell_N_ = 0; std::shared_ptr moduleCell_id_; std::shared_ptr moduleCell_zside_; @@ -104,9 +108,13 @@ class HGCalTriggerGeomTesterV9Imp3 : public edm::stream::EDAnalyzer<> { std::shared_ptr moduleCell_waferV_; std::shared_ptr moduleCell_cellU_; std::shared_ptr moduleCell_cellV_; + std::shared_ptr moduleCell_ieta_; + std::shared_ptr moduleCell_iphi_; std::shared_ptr moduleCell_x_; std::shared_ptr moduleCell_y_; std::shared_ptr moduleCell_z_; + std::shared_ptr moduleCell_eta_; + std::shared_ptr moduleCell_phi_; int triggerCellId_ = 0; int triggerCellSide_ = 0; int triggerCellSubdet_ = 0; @@ -120,6 +128,8 @@ class HGCalTriggerGeomTesterV9Imp3 : public edm::stream::EDAnalyzer<> { float triggerCellX_ = 0; float triggerCellY_ = 0; float triggerCellZ_ = 0; + float triggerCellEta_ = 0; + float triggerCellPhi_ = 0; int triggerCellNeighbor_N_ = 0; std::shared_ptr triggerCellNeighbor_id_; std::shared_ptr triggerCellNeighbor_zside_; @@ -146,6 +156,8 @@ class HGCalTriggerGeomTesterV9Imp3 : public edm::stream::EDAnalyzer<> { std::shared_ptr triggerCellCell_x_; std::shared_ptr triggerCellCell_y_; std::shared_ptr triggerCellCell_z_; + std::shared_ptr triggerCellCell_eta_; + std::shared_ptr triggerCellCell_phi_; int cellId_ = 0; int cellSide_ = 0; int cellSubdet_ = 0; @@ -160,6 +172,8 @@ class HGCalTriggerGeomTesterV9Imp3 : public edm::stream::EDAnalyzer<> { float cellX_ = 0; float cellY_ = 0; float cellZ_ = 0; + float cellEta_ = 0; + float cellPhi_ = 0; int cellCornersN_ = 0; std::shared_ptr cellCornersX_; std::shared_ptr cellCornersY_; @@ -213,6 +227,8 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeModules_->Branch("x", &moduleX_, "x/F"); treeModules_->Branch("y", &moduleY_, "y/F"); treeModules_->Branch("z", &moduleZ_, "z/F"); + treeModules_->Branch("eta", &moduleEta_, "eta/F"); + treeModules_->Branch("phi", &modulePhi_, "phi/F"); treeModules_->Branch("tc_n", &moduleTC_N_, "tc_n/I"); moduleTC_id_.reset(new int[1], array_deleter()); moduleTC_zside_.reset(new int[1], array_deleter()); @@ -225,6 +241,8 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS moduleTC_x_.reset(new float[1], array_deleter()); moduleTC_y_.reset(new float[1], array_deleter()); moduleTC_z_.reset(new float[1], array_deleter()); + moduleTC_eta_.reset(new float[1], array_deleter()); + moduleTC_phi_.reset(new float[1], array_deleter()); treeModules_->Branch("tc_id", moduleTC_id_.get(), "tc_id[tc_n]/I"); treeModules_->Branch("tc_zside", moduleTC_zside_.get(), "tc_zside[tc_n]/I"); treeModules_->Branch("tc_subdet", moduleTC_subdet_.get(), "tc_subdet[tc_n]/I"); @@ -238,6 +256,8 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeModules_->Branch("tc_x", moduleTC_x_.get(), "tc_x[tc_n]/F"); treeModules_->Branch("tc_y", moduleTC_y_.get(), "tc_y[tc_n]/F"); treeModules_->Branch("tc_z", moduleTC_z_.get(), "tc_z[tc_n]/F"); + treeModules_->Branch("tc_eta", moduleTC_eta_.get(), "tc_eta[tc_n]/F"); + treeModules_->Branch("tc_phi", moduleTC_phi_.get(), "tc_phi[tc_n]/F"); treeModules_->Branch("c_n", &moduleCell_N_, "c_n/I"); moduleCell_id_.reset(new int[1], array_deleter()); moduleCell_zside_.reset(new int[1], array_deleter()); @@ -247,9 +267,13 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS moduleCell_waferV_.reset(new int[1], array_deleter()); moduleCell_cellU_.reset(new int[1], array_deleter()); moduleCell_cellV_.reset(new int[1], array_deleter()); + moduleCell_ieta_.reset(new int[1], array_deleter()); + moduleCell_iphi_.reset(new int[1], array_deleter()); moduleCell_x_.reset(new float[1], array_deleter()); moduleCell_y_.reset(new float[1], array_deleter()); moduleCell_z_.reset(new float[1], array_deleter()); + moduleCell_eta_.reset(new float[1], array_deleter()); + moduleCell_phi_.reset(new float[1], array_deleter()); treeModules_->Branch("c_id", moduleCell_id_.get(), "c_id[c_n]/I"); treeModules_->Branch("c_zside", moduleCell_zside_.get(), "c_zside[c_n]/I"); treeModules_->Branch("c_subdet", moduleCell_subdet_.get(), "c_subdet[c_n]/I"); @@ -258,9 +282,13 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeModules_->Branch("c_waferv", moduleCell_waferV_.get(), "c_waferv[c_n]/I"); treeModules_->Branch("c_cellu", moduleCell_cellU_.get(), "c_cellu[c_n]/I"); treeModules_->Branch("c_cellv", moduleCell_cellV_.get(), "c_cellv[c_n]/I"); + treeModules_->Branch("c_ieta", moduleCell_ieta_.get(), "c_ieta[c_n]/I"); + treeModules_->Branch("c_iphi", moduleCell_iphi_.get(), "c_iphi[c_n]/I"); treeModules_->Branch("c_x", moduleCell_x_.get(), "c_x[c_n]/F"); treeModules_->Branch("c_y", moduleCell_y_.get(), "c_y[c_n]/F"); treeModules_->Branch("c_z", moduleCell_z_.get(), "c_z[c_n]/F"); + treeModules_->Branch("c_eta", moduleCell_eta_.get(), "c_eta[c_n]/F"); + treeModules_->Branch("c_phi", moduleCell_phi_.get(), "c_phi[c_n]/F"); // treeTriggerCells_ = fs_->make("TreeTriggerCells", "Tree of all HGC trigger cells"); treeTriggerCells_->Branch("id", &triggerCellId_, "id/I"); @@ -276,6 +304,8 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeTriggerCells_->Branch("x", &triggerCellX_, "x/F"); treeTriggerCells_->Branch("y", &triggerCellY_, "y/F"); treeTriggerCells_->Branch("z", &triggerCellZ_, "z/F"); + treeTriggerCells_->Branch("eta", &triggerCellEta_, "eta/F"); + treeTriggerCells_->Branch("phi", &triggerCellPhi_, "phi/F"); treeTriggerCells_->Branch("neighbor_n", &triggerCellNeighbor_N_, "neighbor_n/I"); triggerCellNeighbor_id_.reset(new int[1], array_deleter()); triggerCellNeighbor_zside_.reset(new int[1], array_deleter()); @@ -310,6 +340,8 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS triggerCellCell_x_.reset(new float[1], array_deleter()); triggerCellCell_y_.reset(new float[1], array_deleter()); triggerCellCell_z_.reset(new float[1], array_deleter()); + triggerCellCell_eta_.reset(new float[1], array_deleter()); + triggerCellCell_phi_.reset(new float[1], array_deleter()); treeTriggerCells_->Branch("c_id", triggerCellCell_id_.get(), "c_id[c_n]/I"); treeTriggerCells_->Branch("c_zside", triggerCellCell_zside_.get(), "c_zside[c_n]/I"); treeTriggerCells_->Branch("c_subdet", triggerCellCell_subdet_.get(), "c_subdet[c_n]/I"); @@ -323,6 +355,8 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeTriggerCells_->Branch("c_x", triggerCellCell_x_.get(), "c_x[c_n]/F"); treeTriggerCells_->Branch("c_y", triggerCellCell_y_.get(), "c_y[c_n]/F"); treeTriggerCells_->Branch("c_z", triggerCellCell_z_.get(), "c_z[c_n]/F"); + treeTriggerCells_->Branch("c_eta", triggerCellCell_eta_.get(), "c_eta[c_n]/F"); + treeTriggerCells_->Branch("c_phi", triggerCellCell_phi_.get(), "c_phi[c_n]/F"); // treeCells_ = fs_->make("TreeCells", "Tree of all HGC cells"); treeCells_->Branch("id", &cellId_, "id/I"); @@ -339,6 +373,8 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeCells_->Branch("x", &cellX_, "x/F"); treeCells_->Branch("y", &cellY_, "y/F"); treeCells_->Branch("z", &cellZ_, "z/F"); + treeCells_->Branch("eta", &cellEta_, "eta/F"); + treeCells_->Branch("phi", &cellPhi_, "phi/F"); treeCells_->Branch("corner_n", &cellCornersN_, "corner_n/I"); treeCells_->Branch("corner_x", cellCornersX_.get(), "corner_x[corner_n]/F"); treeCells_->Branch("corner_y", cellCornersY_.get(), "corner_y[corner_n]/F"); @@ -381,6 +417,8 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeCellsNose_->Branch("x", &cellX_, "x/F"); treeCellsNose_->Branch("y", &cellY_, "y/F"); treeCellsNose_->Branch("z", &cellZ_, "z/F"); + treeCellsNose_->Branch("eta", &cellEta_, "eta/F"); + treeCellsNose_->Branch("phi", &cellPhi_, "phi/F"); treeCellsNose_->Branch("corner_n", &cellCornersN_, "corner_n/I"); treeCellsNose_->Branch("corner_x", cellCornersX_.get(), "corner_x[corner_n]/F"); treeCellsNose_->Branch("corner_y", cellCornersY_.get(), "corner_y[corner_n]/F"); @@ -784,6 +822,8 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() cellX_ = center.x(); cellY_ = center.y(); cellZ_ = center.z(); + cellEta_ = center.eta(); + cellPhi_ = center.phi(); std::vector corners = triggerGeometry_->eeGeometry()->getCorners(id); cellCornersN_ = corners.size(); setTreeCellCornerSize(cellCornersN_); @@ -827,6 +867,8 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() cellX_ = center.x(); cellY_ = center.y(); cellZ_ = center.z(); + cellEta_ = center.eta(); + cellPhi_ = center.phi(); std::vector corners = triggerGeometry_->hsiGeometry()->getCorners(id); cellCornersN_ = corners.size(); setTreeCellCornerSize(cellCornersN_); @@ -906,6 +948,8 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() cellX_ = center.x(); cellY_ = center.y(); cellZ_ = center.z(); + cellEta_ = center.eta(); + cellPhi_ = center.phi(); std::vector corners = triggerGeometry_->noseGeometry()->getCorners(id); cellCornersN_ = corners.size(); setTreeCellCornerSize(cellCornersN_); @@ -945,12 +989,18 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() triggerCellLayer_ = id_sc.layer(); triggerCellIEta_ = id_sc.ietaAbs(); triggerCellIPhi_ = id_sc.iphi(); + triggerCellWaferU_ = 0; + triggerCellWaferV_ = 0; + triggerCellU_ = 0; + triggerCellV_ = 0; } else if (HFNoseTriggerDetId(triggercell_cells.first).det() == DetId::HGCalTrigger && HFNoseTriggerDetId(triggercell_cells.first).subdet() == HGCalTriggerSubdetector::HFNoseTrigger) { HFNoseTriggerDetId id_nose_trig(triggercell_cells.first); triggerCellSide_ = id_nose_trig.zside(); triggerCellSubdet_ = id_nose_trig.subdet(); triggerCellLayer_ = id_nose_trig.layer(); + triggerCellIEta_ = 0; + triggerCellIPhi_ = 0; triggerCellWaferU_ = id_nose_trig.waferU(); triggerCellWaferV_ = id_nose_trig.waferV(); triggerCellU_ = id_nose_trig.triggerCellU(); @@ -960,6 +1010,8 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() triggerCellSide_ = id_si_trig.zside(); triggerCellSubdet_ = id_si_trig.subdet(); triggerCellLayer_ = id_si_trig.layer(); + triggerCellIEta_ = 0; + triggerCellIPhi_ = 0; triggerCellWaferU_ = id_si_trig.waferU(); triggerCellWaferV_ = id_si_trig.waferV(); triggerCellU_ = id_si_trig.triggerCellU(); @@ -968,6 +1020,8 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() triggerCellX_ = position.x(); triggerCellY_ = position.y(); triggerCellZ_ = position.z(); + triggerCellEta_ = position.eta(); + triggerCellPhi_ = position.phi(); triggerCellCell_N_ = triggercell_cells.second.size(); // setTreeTriggerCellSize(triggerCellCell_N_); @@ -989,6 +1043,8 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() triggerCellCell_x_.get()[ic] = cell_position.x(); triggerCellCell_y_.get()[ic] = cell_position.y(); triggerCellCell_z_.get()[ic] = cell_position.z(); + triggerCellCell_eta_.get()[ic] = cell_position.eta(); + triggerCellCell_phi_.get()[ic] = cell_position.phi(); } else if (HFNoseTriggerDetId(triggercell_cells.first).det() == DetId::HGCalTrigger && HFNoseTriggerDetId(triggercell_cells.first).subdet() == HGCalTriggerSubdetector::HFNoseTrigger) { HFNoseDetId cId(c); @@ -1006,6 +1062,8 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() triggerCellCell_x_.get()[ic] = cell_position.x(); triggerCellCell_y_.get()[ic] = cell_position.y(); triggerCellCell_z_.get()[ic] = cell_position.z(); + triggerCellCell_eta_.get()[ic] = cell_position.eta(); + triggerCellCell_phi_.get()[ic] = cell_position.phi(); } else { HGCSiliconDetId cId(c); GlobalPoint cell_position = (cId.det() == DetId::HGCalEE ? triggerGeometry_->eeGeometry()->getPosition(cId) @@ -1023,6 +1081,8 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() triggerCellCell_x_.get()[ic] = cell_position.x(); triggerCellCell_y_.get()[ic] = cell_position.y(); triggerCellCell_z_.get()[ic] = cell_position.z(); + triggerCellCell_eta_.get()[ic] = cell_position.eta(); + triggerCellCell_phi_.get()[ic] = cell_position.phi(); } ic++; } @@ -1045,6 +1105,8 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() moduleX_ = position.x(); moduleY_ = position.y(); moduleZ_ = position.z(); + moduleEta_ = position.eta(); + modulePhi_ = position.phi(); moduleSide_ = id.zside(); moduleSubdet_ = id.triggerSubdetId(); @@ -1106,6 +1168,8 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() moduleTC_x_.get()[itc] = position.x(); moduleTC_y_.get()[itc] = position.y(); moduleTC_z_.get()[itc] = position.z(); + moduleTC_eta_.get()[itc] = position.eta(); + moduleTC_phi_.get()[itc] = position.phi(); itc++; } auto cells_in_module = triggerGeometry_->getCellsFromModule(id); @@ -1117,19 +1181,21 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() if (moduleSubdet_ == HGCalTriggerSubdetector::HGCalHScTrigger) { HGCScintillatorDetId cId(c); GlobalPoint cell_position = triggerGeometry_->hscGeometry()->getPosition(cId); - triggerCellCell_id_.get()[ic] = c; - triggerCellCell_zside_.get()[ic] = cId.zside(); - triggerCellCell_subdet_.get()[ic] = cId.subdetId(); - triggerCellCell_layer_.get()[ic] = cId.layer(); - triggerCellCell_waferU_.get()[ic] = 0; - triggerCellCell_waferV_.get()[ic] = 0; - triggerCellCell_cellU_.get()[ic] = 0; - triggerCellCell_cellV_.get()[ic] = 0; - triggerCellCell_ieta_.get()[ic] = cId.ietaAbs(); - triggerCellCell_iphi_.get()[ic] = cId.iphi(); - triggerCellCell_x_.get()[ic] = cell_position.x(); - triggerCellCell_y_.get()[ic] = cell_position.y(); - triggerCellCell_z_.get()[ic] = cell_position.z(); + moduleCell_id_.get()[ic] = c; + moduleCell_zside_.get()[ic] = cId.zside(); + moduleCell_subdet_.get()[ic] = cId.subdetId(); + moduleCell_layer_.get()[ic] = cId.layer(); + moduleCell_waferU_.get()[ic] = 0; + moduleCell_waferV_.get()[ic] = 0; + moduleCell_cellU_.get()[ic] = 0; + moduleCell_cellV_.get()[ic] = 0; + moduleCell_ieta_.get()[ic] = cId.ietaAbs(); + moduleCell_iphi_.get()[ic] = cId.iphi(); + moduleCell_x_.get()[ic] = cell_position.x(); + moduleCell_y_.get()[ic] = cell_position.y(); + moduleCell_z_.get()[ic] = cell_position.z(); + moduleCell_eta_.get()[ic] = cell_position.eta(); + moduleCell_phi_.get()[ic] = cell_position.phi(); } else if (moduleSubdet_ == HGCalTriggerSubdetector::HFNoseTrigger) { HFNoseDetId cId(c); const GlobalPoint position = triggerGeometry_->noseGeometry()->getPosition(c); @@ -1141,9 +1207,13 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() moduleCell_waferV_.get()[ic] = cId.waferV(); moduleCell_cellU_.get()[ic] = cId.cellU(); moduleCell_cellV_.get()[ic] = cId.cellV(); + moduleCell_ieta_.get()[ic] = 0; + moduleCell_iphi_.get()[ic] = 0; moduleCell_x_.get()[ic] = position.x(); moduleCell_y_.get()[ic] = position.y(); moduleCell_z_.get()[ic] = position.z(); + moduleCell_eta_.get()[ic] = position.eta(); + moduleCell_phi_.get()[ic] = position.phi(); } else { HGCSiliconDetId cId(c); const GlobalPoint position = (cId.det() == DetId::HGCalEE ? triggerGeometry_->eeGeometry()->getPosition(cId) @@ -1156,11 +1226,15 @@ void HGCalTriggerGeomTesterV9Imp3::fillTriggerGeometry() moduleCell_waferV_.get()[ic] = cId.waferV(); moduleCell_cellU_.get()[ic] = cId.cellU(); moduleCell_cellV_.get()[ic] = cId.cellV(); + moduleCell_ieta_.get()[ic] = 0; + moduleCell_iphi_.get()[ic] = 0; moduleCell_x_.get()[ic] = position.x(); moduleCell_y_.get()[ic] = position.y(); moduleCell_z_.get()[ic] = position.z(); - ic++; + moduleCell_eta_.get()[ic] = position.eta(); + moduleCell_phi_.get()[ic] = position.phi(); } + ic++; } treeModules_->Fill(); } @@ -1188,6 +1262,8 @@ void HGCalTriggerGeomTesterV9Imp3::setTreeModuleSize(const size_t n) moduleTC_x_.reset(new float[n], array_deleter()); moduleTC_y_.reset(new float[n], array_deleter()); moduleTC_z_.reset(new float[n], array_deleter()); + moduleTC_eta_.reset(new float[n], array_deleter()); + moduleTC_phi_.reset(new float[n], array_deleter()); treeModules_->GetBranch("tc_id")->SetAddress(moduleTC_id_.get()); treeModules_->GetBranch("tc_zside")->SetAddress(moduleTC_zside_.get()); @@ -1202,6 +1278,8 @@ void HGCalTriggerGeomTesterV9Imp3::setTreeModuleSize(const size_t n) treeModules_->GetBranch("tc_x")->SetAddress(moduleTC_x_.get()); treeModules_->GetBranch("tc_y")->SetAddress(moduleTC_y_.get()); treeModules_->GetBranch("tc_z")->SetAddress(moduleTC_z_.get()); + treeModules_->GetBranch("tc_eta")->SetAddress(moduleTC_eta_.get()); + treeModules_->GetBranch("tc_phi")->SetAddress(moduleTC_phi_.get()); } /*****************************************************************/ @@ -1219,6 +1297,8 @@ void HGCalTriggerGeomTesterV9Imp3::setTreeModuleCellSize(const size_t n) moduleCell_x_.reset(new float[n], array_deleter()); moduleCell_y_.reset(new float[n], array_deleter()); moduleCell_z_.reset(new float[n], array_deleter()); + moduleCell_eta_.reset(new float[n], array_deleter()); + moduleCell_phi_.reset(new float[n], array_deleter()); treeModules_->GetBranch("c_id")->SetAddress(moduleCell_id_.get()); treeModules_->GetBranch("c_zside")->SetAddress(moduleCell_zside_.get()); @@ -1231,6 +1311,8 @@ void HGCalTriggerGeomTesterV9Imp3::setTreeModuleCellSize(const size_t n) treeModules_->GetBranch("c_x")->SetAddress(moduleCell_x_.get()); treeModules_->GetBranch("c_y")->SetAddress(moduleCell_y_.get()); treeModules_->GetBranch("c_z")->SetAddress(moduleCell_z_.get()); + treeModules_->GetBranch("c_eta")->SetAddress(moduleCell_eta_.get()); + treeModules_->GetBranch("c_phi")->SetAddress(moduleCell_phi_.get()); } /*****************************************************************/ @@ -1250,6 +1332,8 @@ void HGCalTriggerGeomTesterV9Imp3::setTreeTriggerCellSize(const size_t n) triggerCellCell_x_.reset(new float[n], array_deleter()); triggerCellCell_y_.reset(new float[n], array_deleter()); triggerCellCell_z_.reset(new float[n], array_deleter()); + triggerCellCell_eta_.reset(new float[n], array_deleter()); + triggerCellCell_phi_.reset(new float[n], array_deleter()); treeTriggerCells_->GetBranch("c_id")->SetAddress(triggerCellCell_id_.get()); treeTriggerCells_->GetBranch("c_zside")->SetAddress(triggerCellCell_zside_.get()); @@ -1264,6 +1348,8 @@ void HGCalTriggerGeomTesterV9Imp3::setTreeTriggerCellSize(const size_t n) treeTriggerCells_->GetBranch("c_x")->SetAddress(triggerCellCell_x_.get()); treeTriggerCells_->GetBranch("c_y")->SetAddress(triggerCellCell_y_.get()); treeTriggerCells_->GetBranch("c_z")->SetAddress(triggerCellCell_z_.get()); + treeTriggerCells_->GetBranch("c_eta")->SetAddress(triggerCellCell_eta_.get()); + treeTriggerCells_->GetBranch("c_phi")->SetAddress(triggerCellCell_phi_.get()); } /*****************************************************************/ diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py index 7d0c20f6e4928..04972c9f6e5d8 100644 --- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py +++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py @@ -94,8 +94,8 @@ process.load('L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff') # Eventually modify default geometry parameters -from L1Trigger.L1THGCal.customTriggerGeometry import custom_geometry_decentralized_V11 -process = custom_geometry_decentralized_V11(process) +from L1Trigger.L1THGCal.customTriggerGeometry import custom_geometry_V11_Imp2 +process = custom_geometry_V11_Imp2(process) process.hgcaltriggergeomtester = cms.EDAnalyzer( "HGCalTriggerGeomTesterV9Imp2" diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py index 6acb990f89c4d..f12b8ff896814 100644 --- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py +++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py @@ -101,8 +101,8 @@ process.load('L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff') # Eventually modify default geometry parameters -from L1Trigger.L1THGCal.customTriggerGeometry import custom_geometry_decentralized_V11 -process = custom_geometry_decentralized_V11(process, implementation=2) +from L1Trigger.L1THGCal.customTriggerGeometry import custom_geometry_V11_Imp3 +process = custom_geometry_V11_Imp3(process) process.hgcaltriggergeomtester = cms.EDAnalyzer( "HGCalTriggerGeomTesterV9Imp3"