From edf3b093faa639eb3861b8e79b9ee72af0fcb188 Mon Sep 17 00:00:00 2001
From: fgravili <francesco.giuseppe.gravili@cern.ch>
Date: Wed, 19 Mar 2025 13:08:27 +0100
Subject: [PATCH] Porting 78514 manually to main
---
.../TrigT1NSWSimTools/MMLoadVariables.h | 6 +-
.../TrigT1NSWSimTools/MMT_Diamond.h | 8 +--
.../TrigT1NSWSimTools/MMT_Hit.h | 20 ++----
.../TrigT1NSWSimTools/MMT_struct.h | 11 ++--
.../TrigT1NSWSimTools/src/MMLoadVariables.cxx | 8 +--
.../TrigT1NSWSimTools/src/MMT_Diamond.cxx | 8 +--
.../TrigT1/TrigT1NSWSimTools/src/MMT_Hit.cxx | 25 ++------
.../TrigT1NSWSimTools/src/MMT_struct.cxx | 64 +------------------
.../TrigT1NSWSimTools/src/MMTriggerTool.cxx | 8 +--
9 files changed, 38 insertions(+), 120 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMLoadVariables.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMLoadVariables.h
index bfd78a6fc02d..7ff567c40bde 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMLoadVariables.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMLoadVariables.h
@@ -36,9 +36,9 @@ namespace MuonGM {
const McEventCollection *truthContainer,
const TrackRecordCollection* trackRecordCollection,
const MmDigitContainer *nsw_MmDigitContainer,
- std::map<std::pair<int,unsigned int>,std::vector<digitWrapper> >& entries,
- std::map<std::pair<int,unsigned int>,std::vector<hitData_entry> >& Hits_Data_Set_Time,
- std::map<std::pair<int,unsigned int>,evInf_entry>& Event_Info) const;
+ std::map<std::pair<uint64_t,unsigned int>,std::vector<digitWrapper> >& entries,
+ std::map<std::pair<uint64_t,unsigned int>,std::vector<hitData_entry> >& Hits_Data_Set_Time,
+ std::map<std::pair<uint64_t,unsigned int>,evInf_entry>& Event_Info) const;
private:
const MuonGM::MuonDetectorManager* m_detManager; //!< MuonDetectorManager
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_Diamond.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_Diamond.h
index 35bd76699003..da2b7f63a5d5 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_Diamond.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_Diamond.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MMT_DIAMOND_H
@@ -11,10 +11,10 @@
#include <vector>
struct slope_t {
- slope_t(int ev=-1, int bc=-1, unsigned int tC=999, unsigned int rC=999, int iX=-1, int iU=-1, int iV=-1, unsigned int uvb=999, unsigned int xb=999,
+ slope_t(uint64_t ev=0, int bc=-1, unsigned int tC=999, unsigned int rC=999, int iX=-1, int iU=-1, int iV=-1, unsigned int uvb=999, unsigned int xb=999,
unsigned int uvm=999, unsigned int xm=999, int age=-1, double mxl=999., double my=999., double uavg=999., double vavg=999., double mx=999.,
double th=999., double eta=999., double dth=999., char side='-', double phi=999., double phiS=999., bool lowRes=false);
- unsigned int event;
+ uint64_t event;
int BC;
unsigned int totalCount;
unsigned int realCount;
@@ -56,7 +56,7 @@ class MMT_Diamond : public AthMessaging {
void clearEvent();
void createRoads_fillHits(const unsigned int iterator, std::vector<hitData_entry> &hitDatas, const MuonGM::MuonDetectorManager* detManager, std::shared_ptr<MMT_Parameters> par, const int phi);
- void findDiamonds(const unsigned int iterator, const int event);
+ void findDiamonds(const unsigned int iterator, const uint64_t event);
double phiShift(const int n, const double phi, const char side) const;
const std::vector<diamond_t>& getDiamondVector() const { return m_diamonds; }
diamond_t getDiamond(const unsigned int iterator) const { return m_diamonds.at(iterator); }
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_Hit.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_Hit.h
index c3973c0e4fb1..16140d52df53 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_Hit.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_Hit.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MMT_HIT_H
@@ -7,13 +7,9 @@
#include "MMT_struct.h"
-namespace MuonGM {
- class MuonDetectorManager;
-}
-
class MMT_Hit {
public:
- MMT_Hit(const hitData_entry &entry, const MuonGM::MuonDetectorManager* detManager, const std::shared_ptr<MMT_Parameters> par, const std::vector<ROOT::Math::XYZVector> &planeCoordinates);
+ MMT_Hit(const hitData_entry &entry, const MuonGM::MuonDetectorManager* detManager, const std::string_view stName, const std::vector<ROOT::Math::XYZVector> &planeCoordinates);
MMT_Hit(const MMT_Hit* hit);
~MMT_Hit()=default;
@@ -22,12 +18,10 @@ class MMT_Hit {
int getBC() const { return m_BC_time; }
int getChannel() const { return m_strip; }
int getGasGap() const { return m_gasgap; }
- const std::string& getModule() const { return m_module; }
int getMultiplet() const { return m_multiplet; }
int getPlane() const { return m_plane; }
char getSector() const { return m_sector; }
double getRZSlope() const { return m_RZslope; }
- double getYZSlope() const { return m_YZslope; }
int getVMM() const { return m_VMM_chip; }
int getMMFE8() const { return m_MMFE_VMM; }
float getShift() const { return m_shift; }
@@ -37,7 +31,6 @@ class MMT_Hit {
double getR() const { return m_R; }
double getRp() const { return m_Rp; }
double getX() const { return m_localX; }
- double getY() const { return m_Y; }
double getZ() const { return m_Z; }
double getPitchOverZ() const { return m_PitchOverZ; }
float getTime() const { return m_time; }
@@ -45,19 +38,16 @@ class MMT_Hit {
bool isX() const;
bool isU() const;
bool isV() const;
- void printHit() const;
void setAge(int age) { m_age = age; }
void setAsNoise() { m_isNoise = true; }
void setBC(int bc) { m_BC_time = bc; }
void setRZSlope(double slope) { m_RZslope = slope; }
- void setYZSlope(double slope) { m_YZslope = slope; }
- void setY(double y) { m_Y = y; }
void setZ(double z) { m_Z = z; }
bool verifyHit() const;
private:
char m_sector;
- std::string m_module, m_station_name;
+ std::string m_station_name;
int m_VMM_chip;
int m_MMFE_VMM;
int m_ART_ASIC;
@@ -68,9 +58,9 @@ class MMT_Hit {
int m_gasgap;
int m_strip;
double m_localX;
- double m_RZslope, m_YZslope;
+ double m_RZslope;
int m_BC_time, m_age;
- double m_Y, m_Z, m_PitchOverZ;
+ double m_Z, m_PitchOverZ;
double m_R, m_Rp;
bool m_isNoise;
float m_time, m_shift;
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_struct.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_struct.h
index 578fe427ca64..72610aa425dd 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_struct.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMT_struct.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MM_STRUCT_H
@@ -57,20 +57,21 @@ class MMT_Parameters : public AthMessaging {
};
struct evInf_entry{
- evInf_entry(int event=0,int pdg=0,double e=0,double p=0,double ieta=0,double peta=0,double eeta=0,double iphi=0,double pphi=0,double ephi=0,
+ evInf_entry(uint64_t event=0,int pdg=0,double e=0,double p=0,double ieta=0,double peta=0,double eeta=0,double iphi=0,double pphi=0,double ephi=0,
double ithe=0,double pthe=0,double ethe=0,double dth=0,int trn=0,int mun=0,const ROOT::Math::XYZVector& tex=ROOT::Math::XYZVector());
- int athena_event,pdg_id;
+ uint64_t athena_event;
+ int pdg_id;
double E,pt,eta_ip,eta_pos,eta_ent,phi_ip,phi_pos,phi_ent,theta_ip,theta_pos,theta_ent,dtheta;
int truth_n,mu_n;
ROOT::Math::XYZVector vertex;
};
struct hitData_entry{
- hitData_entry(int ev=0, double gt=0, double q=0, int vmm=0, int mmfe=0, int pl=0, int st=0, int est=0, int phi=0, int mult=0, int gg=0, double locX=0, double tr_the=0, double tru_phi=0,
+ hitData_entry(uint64_t ev=0, double gt=0, double q=0, int vmm=0, int mmfe=0, int pl=0, int st=0, int est=0, int phi=0, int mult=0, int gg=0, double locX=0, double tr_the=0, double tru_phi=0,
bool q_tbg=0, int bct=0, const ROOT::Math::XYZVector& tru=ROOT::Math::XYZVector(), const ROOT::Math::XYZVector& rec=ROOT::Math::XYZVector());
- int event;
+ uint64_t event;
double gtime,charge;
int VMM_chip,MMFE_VMM,plane,strip,station_eta,station_phi,multiplet,gasgap;
double localX,tru_theta_ip,tru_phi_ip;
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/MMLoadVariables.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/MMLoadVariables.cxx
index e5adc9cda9e4..04d1a1298f43 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/MMLoadVariables.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/MMLoadVariables.cxx
@@ -15,9 +15,9 @@ StatusCode MMLoadVariables::getMMDigitsInfo(const EventContext& ctx,
const McEventCollection *truthContainer,
const TrackRecordCollection* trackRecordCollection,
const MmDigitContainer *nsw_MmDigitContainer,
- std::map<std::pair<int,unsigned int>,std::vector<digitWrapper> >& entries,
- std::map<std::pair<int,unsigned int>,std::vector<hitData_entry> >& Hits_Data_Set_Time,
- std::map<std::pair<int,unsigned int>,evInf_entry>& Event_Info) const {
+ std::map<std::pair<uint64_t,unsigned int>,std::vector<digitWrapper> >& entries,
+ std::map<std::pair<uint64_t,unsigned int>,std::vector<hitData_entry> >& Hits_Data_Set_Time,
+ std::map<std::pair<uint64_t,unsigned int>,evInf_entry>& Event_Info) const {
//*******Following MuonPRD code to access all the variables**********
std::vector<ROOT::Math::PtEtaPhiEVector> truthParticles, truthParticles_ent, truthParticles_pos;
std::vector<int> pdg;
@@ -90,7 +90,7 @@ StatusCode MMLoadVariables::getMMDigitsInfo(const EventContext& ctx,
} //end truth container loop (should be only 1 container per event)
} // if truth container is not null
- int event = ctx.eventID().event_number();
+ uint64_t event = ctx.eventID().event_number();
int TruthParticle_n = j;
unsigned int digit_particles = 0;
for(auto digitCollectionIter : *nsw_MmDigitContainer) {
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_Diamond.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_Diamond.cxx
index d0e0139594b4..edbf6644e7ae 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_Diamond.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_Diamond.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigT1NSWSimTools/MMT_Diamond.h"
@@ -61,7 +61,7 @@ void MMT_Diamond::createRoads_fillHits(const unsigned int iterator, std::vector<
this->setUVfactor(uvfactor);
for (const auto &hit_entry : hitDatas) {
- auto myhit = std::make_shared<MMT_Hit>(hit_entry, detManager, par, planeCoordinates);
+ auto myhit = std::make_shared<MMT_Hit>(hit_entry, detManager, sector, planeCoordinates);
if (myhit->verifyHit()) {
m_hitslopes.push_back(myhit->getRZSlope());
entry.ev_hits.push_back(myhit);
@@ -107,7 +107,7 @@ void MMT_Diamond::createRoads_fillHits(const unsigned int iterator, std::vector<
ATH_MSG_DEBUG("CreateRoadsAndFillHits: Feeding hitDatas Ended");
}
-void MMT_Diamond::findDiamonds(const unsigned int iterator, const int event) {
+void MMT_Diamond::findDiamonds(const unsigned int iterator, const uint64_t event) {
if (m_diamonds[iterator].ev_hits.empty()) return;
auto t0 = std::chrono::high_resolution_clock::now();
@@ -279,7 +279,7 @@ void MMT_Diamond::resetSlopes() {
if (!m_hitslopes.empty()) m_hitslopes.clear();
}
-slope_t::slope_t(int ev, int bc, unsigned int tC, unsigned int rC, int iX, int iU, int iV, unsigned int uvb, unsigned int xb, unsigned int uvm, unsigned int xm,
+slope_t::slope_t(uint64_t ev, int bc, unsigned int tC, unsigned int rC, int iX, int iU, int iV, unsigned int uvb, unsigned int xb, unsigned int uvm, unsigned int xm,
int age, double mxl, double my, double uavg, double vavg, double mx, double th, double eta, double dth, char side, double phi, double phiS,
bool lowRes) :
event(ev), BC(bc), totalCount(tC), realCount(rC), iRoad(iX), iRoadu(iU), iRoadv(iV), uvbkg(uvb), xbkg(xb), uvmuon(uvm), xmuon(xm),
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_Hit.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_Hit.cxx
index 3c6739615b89..b28f8b9f3736 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_Hit.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_Hit.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigT1NSWSimTools/MMT_Hit.h"
@@ -8,15 +8,10 @@
#include "MuonReadoutGeometry/MMReadoutElement.h"
#include <cmath>
-MMT_Hit::MMT_Hit(const hitData_entry &entry, const MuonGM::MuonDetectorManager* detManager, const std::shared_ptr<MMT_Parameters> par, const std::vector<ROOT::Math::XYZVector> &planeCoordinates) {
- m_sector = par->getSector();
-
- std::string module(1, m_sector);
- module += (std::abs(entry.station_eta) == 1) ? "M1" : "M2";
- m_module = module;
-
- m_station_name = "MM";
- m_station_name += m_sector;
+MMT_Hit::MMT_Hit(const hitData_entry &entry, const MuonGM::MuonDetectorManager* detManager, const std::string_view stName, const std::vector<ROOT::Math::XYZVector> &planeCoordinates)
+ : m_station_name(stName)
+ {
+ m_sector = stName[2];
m_VMM_chip = entry.VMM_chip;
m_MMFE_VMM = entry.MMFE_VMM;
m_ART_ASIC = std::ceil(1.*entry.MMFE_VMM/2);
@@ -29,14 +24,12 @@ MMT_Hit::MMT_Hit(const hitData_entry &entry, const MuonGM::MuonDetectorManager*
m_localX = entry.localX;
m_BC_time = entry.BC_time;
m_age = entry.BC_time;
- m_Y = -1.;
m_Z = -1.;
m_R = -1.;
m_Rp = -1.;
m_isNoise = false;
m_time = entry.gtime;
m_RZslope = -1.;
- m_YZslope = -1.;
m_PitchOverZ = -1.;
m_shift = -1.;
@@ -94,11 +87,6 @@ MMT_Hit::MMT_Hit(const hitData_entry &entry, const MuonGM::MuonDetectorManager*
m_PitchOverZ = stripPitch/m_Z;
m_RZslope = m_R / m_Z;
- int eta = std::abs(m_station_eta)-1;
- double base = par->getYbase(m_plane, eta);
- m_Y = base + m_strip*stripPitch - stripPitch/2.;
- m_YZslope = m_Y / m_Z;
-
double index = std::round((std::abs(m_RZslope)-0.1)/5e-04); // 0.0005 is approx. the step in slope achievable with a road size of 8 strips
double roundedSlope = 0.1 + index*((0.6 - 0.1)/1000.);
const double distanceFromZAxis = readout->absTransform().translation().perp() - 0.5*readout->getRsize();
@@ -109,7 +97,6 @@ MMT_Hit::MMT_Hit(const hitData_entry &entry, const MuonGM::MuonDetectorManager*
MMT_Hit::MMT_Hit(const MMT_Hit* hit)
: m_sector (hit->m_sector),
- m_module (hit->m_module),
m_station_name (hit->m_station_name),
m_VMM_chip (hit->m_VMM_chip),
m_MMFE_VMM (hit->m_MMFE_VMM),
@@ -122,10 +109,8 @@ MMT_Hit::MMT_Hit(const MMT_Hit* hit)
m_strip (hit->m_strip),
m_localX (hit->m_localX),
m_RZslope (hit->m_RZslope),
- m_YZslope (hit->m_YZslope),
m_BC_time (hit->m_BC_time),
m_age (hit->m_age),
- m_Y (hit->m_Y),
m_Z (hit->m_Z),
m_PitchOverZ (hit->m_PitchOverZ),
m_R (hit->m_R),
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_struct.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_struct.cxx
index dd59cd109c93..74c0d053c488 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_struct.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/MMT_struct.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigT1NSWSimTools/MMT_struct.h"
@@ -42,64 +42,6 @@ MMT_Parameters::MMT_Parameters(const std::string& layerSetup, char wedgeSize, co
ATH_MSG_WARNING("Number of planes in setup is "<< layerSetup.size() << ", but we have a nominal " << z_nominal.size() << " planes.");
throw std::runtime_error("MMT_Parameters: Invalid number of planes");
}
-
- float stereo_degree = design->stereoAngle();
-
- // MM_firststrip_positions returns the position for phi sector 1.
- // => for the small sectors, rotate this by -1/16 of a rotation to make our lives easier.
- // in this coordinate basis, x is up/down the wedge (radial), and y is left/right (phi).
- float cos_rotation = std::cos(-2*M_PI / 16.0);
- float sin_rotation = std::sin(-2*M_PI / 16.0);
- float x_rotated = 0.0;
- float y_rotated = 0.0;
-
- float st_angle = 0.0;
-
- float radial_pos = 0;
- float radial_pos_xx_1 = 0, radial_pos_xx_2 = 0;
- float radial_pos_uv_1 = 0, radial_pos_uv_2 = 0;
-
- for (unsigned int eta = 1; eta <= 2; eta++){
- unsigned int layer = 1;
- for (const auto& pos: MM_firststrip_positions(detManager, wedgeString, eta)){
-
- if (wedgeString=="MMS"){
- x_rotated = pos.X()*cos_rotation - pos.Y()*sin_rotation;
- y_rotated = pos.X()*sin_rotation + pos.Y()*cos_rotation;
- }
- else{
- x_rotated = pos.X();
- y_rotated = pos.Y();
- }
-
- if (is_u(layer)) st_angle = -1*std::abs(stereo_degree);
- else if (is_v(layer)) st_angle = std::abs(stereo_degree);
- else st_angle = 0;
-
- // walk from the center of the strip to the position of the strip at the center of the wedge.
- // NB: for X-planes, this is simply the center of the strip: tan(0) = 0.
- radial_pos = std::abs(x_rotated - y_rotated*std::tan(st_angle * M_PI/180.0));
-
- if (is_x(layer) && eta==1) radial_pos_xx_1 = radial_pos;
- else if (is_x(layer) && eta==2) radial_pos_xx_2 = radial_pos;
- if (is_u(layer) && eta==1) radial_pos_uv_1 = radial_pos;
- else if (is_u(layer) && eta==2) radial_pos_uv_2 = radial_pos;
-
- layer++;
- }
- }
-
- // store radial positions as fixed point
- std::array<float, 2> radial_pos_xx = {radial_pos_xx_1, radial_pos_xx_2};
- std::array<float, 2> radial_pos_uv = {radial_pos_uv_1, radial_pos_uv_2};
- m_ybases[0] = radial_pos_xx;
- m_ybases[1] = radial_pos_xx;
- m_ybases[2] = radial_pos_uv;
- m_ybases[3] = radial_pos_uv;
- m_ybases[4] = radial_pos_uv;
- m_ybases[5] = radial_pos_uv;
- m_ybases[6] = radial_pos_xx;
- m_ybases[7] = radial_pos_xx;
}
std::vector<ROOT::Math::XYZVector> MMT_Parameters::MM_firststrip_positions(const MuonGM::MuonDetectorManager* detManager, const std::string& wedge, int eta) const {
@@ -135,13 +77,13 @@ std::vector<ROOT::Math::XYZVector> MMT_Parameters::MM_firststrip_positions(const
return positions;
}
-evInf_entry::evInf_entry(int event,int pdg,double e,double p,double ieta,double peta,double eeta,double iphi,double pphi,double ephi,double ithe,double pthe,double ethe,double dth,
+evInf_entry::evInf_entry(uint64_t event,int pdg,double e,double p,double ieta,double peta,double eeta,double iphi,double pphi,double ephi,double ithe,double pthe,double ethe,double dth,
int trn,int mun,const ROOT::Math::XYZVector& tex):
athena_event(event),pdg_id(pdg),E(e),pt(p),eta_ip(ieta),eta_pos(peta),eta_ent(eeta),phi_ip(iphi),phi_pos(pphi),phi_ent(ephi),theta_ip(ithe),theta_pos(pthe),theta_ent(ethe),
dtheta(dth),truth_n(trn),mu_n(mun),vertex(tex) {}
-hitData_entry::hitData_entry(int ev, double gt, double q, int vmm, int mmfe, int pl, int st, int est, int phi, int mult, int gg, double locX, double tr_the, double tru_phi,
+hitData_entry::hitData_entry(uint64_t ev, double gt, double q, int vmm, int mmfe, int pl, int st, int est, int phi, int mult, int gg, double locX, double tr_the, double tru_phi,
bool q_tbg, int bct, const ROOT::Math::XYZVector& tru, const ROOT::Math::XYZVector& rec):
event(ev),gtime(gt),charge(q),VMM_chip(vmm),MMFE_VMM(mmfe),plane(pl),strip(st),station_eta(est),station_phi(phi),multiplet(mult),gasgap(gg),localX(locX),tru_theta_ip(tr_the),tru_phi_ip(tru_phi),truth_nbg(q_tbg),BC_time(bct),truth(tru),recon(rec) {}
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/MMTriggerTool.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/MMTriggerTool.cxx
index 402f72b553a3..734a5aa78f57 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/MMTriggerTool.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/MMTriggerTool.cxx
@@ -145,7 +145,7 @@ namespace NSWL1 {
StatusCode MMTriggerTool::runTrigger(const EventContext& ctx, Muon::NSW_TrigRawDataContainer* rdo, const bool do_MMDiamonds) const {
- int event = ctx.eventID().event_number();
+ uint64_t event = ctx.eventID().event_number();
ATH_MSG_DEBUG("********************************************************* EVENT NUMBER = " << event);
//////////////////////////////////////////////////////////////
@@ -162,9 +162,9 @@ namespace NSWL1 {
pars["MMS"] = m_par_small;
MMLoadVariables load = MMLoadVariables(detManager, m_MmIdHelper);
- std::map<std::pair<int, unsigned int>,std::vector<digitWrapper> > entries;
- std::map<std::pair<int, unsigned int>,std::vector<hitData_entry> > Hits_Data_Set_Time;
- std::map<std::pair<int, unsigned int>,evInf_entry> Event_Info;
+ std::map<std::pair<uint64_t, unsigned int>,std::vector<digitWrapper> > entries;
+ std::map<std::pair<uint64_t, unsigned int>,std::vector<hitData_entry> > Hits_Data_Set_Time;
+ std::map<std::pair<uint64_t, unsigned int>,evInf_entry> Event_Info;
const McEventCollection* ptrMcEventCollection = nullptr;
const TrackRecordCollection* ptrMuonEntryLayer = nullptr;
--
GitLab