Skip to content
Snippets Groups Projects
Commit cf282226 authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'arrays.TileRec-20190208' into 'master' 

TileRec: Move large arrays into separately-allocated objects.

See merge request atlas/athena!20982
parents 733d214c 564e1140
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
TileCalorimeter/TileRec/TileRec/TileAANtuple.h
+ 117
− 113
View file @ cf282226
......@@ -211,120 +211,124 @@ class TileAANtuple : public AthAlgorithm {
float m_las_MeasAmp;
float m_las_Temperature;
// LASERI
int m_las_D_ADC[TileLaserObject::nbGains][TileLaserObject::nbDiodes];
float m_las_D_Ped[TileLaserObject::nbGains][TileLaserObject::nbDiodes];
float m_las_D_Ped_RMS[TileLaserObject::nbGains][TileLaserObject::nbDiodes];
float m_las_D_Alpha[TileLaserObject::nbGains][TileLaserObject::nbDiodes];
float m_las_D_Alpha_RMS[TileLaserObject::nbGains][TileLaserObject::nbDiodes];
float m_las_D_AlphaPed[TileLaserObject::nbGains][TileLaserObject::nbDiodes];
float m_las_D_AlphaPed_RMS[TileLaserObject::nbGains][TileLaserObject::nbDiodes];
int m_las_PMT_ADC[TileLaserObject::nbGains][TileLaserObject::nbPmts];
int m_las_PMT_TDC[TileLaserObject::nbGains][TileLaserObject::nbPmts];
float m_las_PMT_Ped[TileLaserObject::nbGains][TileLaserObject::nbPmts];
float m_las_PMT_Ped_RMS[TileLaserObject::nbGains][TileLaserObject::nbPmts];
// LASERII
int m_daqtype;
int m_chan[32]; // Mean value for monitoring diodes, PMTs, phocal, CIS
float m_chan_Ped[32]; // Corresponding pedestal values
float m_chan_Led[32]; // Corresponding LED values
float m_chan_Lin[32]; // Corresponding linearity values
float m_chan_Alpha[32]; // Corresponding alpha peaks
float m_chan_SPed[32]; // Sigma of pedestal values
float m_chan_SLed[32]; // Sigma of LED values
float m_chan_SLin[32]; // Sigma of linearity values
float m_chan_SAlpha[32]; // Sigma of alpha peaks
// Digi/Energy items
short m_sampleFlt[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES];
short m_gainFlt[N_ROS2][N_MODULES][N_CHANS];
short m_sample[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES];
short m_gain[N_ROS2][N_MODULES][N_CHANS];
short m_rodBCID[N_ROS][N_MODULES];
short m_fragSize[N_ROS][N_MODULES];
uint16_t m_dmuMask[N_ROS][N_MODULES][2];
uint16_t m_slinkCRC[N_ROS][N_MODULES][2];
uint32_t m_DMUheader[N_ROS2][N_MODULES][N_DMUS];
short m_DMUbcid[N_ROS2][N_MODULES][N_DMUS];
short m_DMUformatErr[N_ROS2][N_MODULES][N_DMUS];
short m_DMUparityErr[N_ROS2][N_MODULES][N_DMUS];
short m_DMUmemoryErr[N_ROS2][N_MODULES][N_DMUS];
short m_DMUDstrobeErr[N_ROS2][N_MODULES][N_DMUS];
short m_DMUSstrobeErr[N_ROS2][N_MODULES][N_DMUS];
short m_feCRC[N_ROS2][N_MODULES][N_DMUS];
short m_rodCRC[N_ROS2][N_MODULES][N_DMUS];
float m_ene[N_ROS2][N_MODULES][N_CHANS];
float m_time[N_ROS2][N_MODULES][N_CHANS];
float m_ped[N_ROS2][N_MODULES][N_CHANS];
float m_chi2[N_ROS2][N_MODULES][N_CHANS];
float m_eFit[N_ROS2][N_MODULES][N_CHANS];
float m_tFit[N_ROS2][N_MODULES][N_CHANS];
float m_pedFit[N_ROS2][N_MODULES][N_CHANS];
float m_chi2Fit[N_ROS2][N_MODULES][N_CHANS];
float m_eFitc[N_ROS2][N_MODULES][N_CHANS];
float m_tFitc[N_ROS2][N_MODULES][N_CHANS];
float m_pedFitc[N_ROS2][N_MODULES][N_CHANS];
float m_chi2Fitc[N_ROS2][N_MODULES][N_CHANS];
float m_eOpt[N_ROS2][N_MODULES][N_CHANS];
float m_tOpt[N_ROS2][N_MODULES][N_CHANS];
float m_pedOpt[N_ROS2][N_MODULES][N_CHANS];
float m_chi2Opt[N_ROS2][N_MODULES][N_CHANS];
float m_eQIE[N_ROS2][N_MODULES][N_CHANS];
float m_tQIE[N_ROS2][N_MODULES][N_CHANS];
float m_pedQIE[N_ROS2][N_MODULES][N_CHANS];
float m_chi2QIE[N_ROS2][N_MODULES][N_CHANS];
float m_eOF1[N_ROS2][N_MODULES][N_CHANS];
float m_tOF1[N_ROS2][N_MODULES][N_CHANS];
float m_pedOF1[N_ROS2][N_MODULES][N_CHANS];
float m_chi2OF1[N_ROS2][N_MODULES][N_CHANS];
float m_eDsp[N_ROS2][N_MODULES][N_CHANS];
float m_tDsp[N_ROS2][N_MODULES][N_CHANS];
float m_pedDsp[N_ROS2][N_MODULES][N_CHANS];
float m_chi2Dsp[N_ROS2][N_MODULES][N_CHANS];
float m_eMF[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES];
float m_tMF[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES];
float m_chi2MF[N_ROS2][N_MODULES][N_CHANS];
float m_pedMF[N_ROS2][N_MODULES][N_CHANS];
short m_ROD_GlobalCRC[N_ROS][N_MODULES];
short m_ROD_BCID[N_ROS][N_MODULES];
short m_ROD_DMUBCIDErr[N_ROS][N_MODULES][N_DMUS];
short m_ROD_DMUmemoryErr[N_ROS][N_MODULES][N_DMUS];
short m_ROD_DMUSstrobeErr[N_ROS][N_MODULES][N_DMUS];
short m_ROD_DMUDstrobeErr[N_ROS][N_MODULES][N_DMUS];
short m_ROD_DMUHeadformatErr[N_ROS][N_MODULES][N_DMUS];
short m_ROD_DMUHeadparityErr[N_ROS][N_MODULES][N_DMUS];
short m_ROD_DMUDataformatErr[N_ROS][N_MODULES][N_DMUS];
short m_ROD_DMUDataparityErr[N_ROS][N_MODULES][N_DMUS];
short m_ROD_DMUfeCRC[N_ROS][N_MODULES][N_DMUS];
short m_ROD_DMUrodCRC[N_ROS][N_MODULES][N_DMUS];
uint16_t m_ROD_DMUMask[N_ROS][N_MODULES][2];
float m_eTMDB[N_ROS][N_MODULES][N_TMDBCHANS]; // TMDB
unsigned char m_sampleTMDB[N_ROS][N_MODULES][N_TMDBCHANS][N_SAMPLES]; // TMDB
unsigned char m_decisionTMDB[N_ROS][N_MODULES][N_TMDBDECISIONS]; // TMDB
struct Arrays {
// LASERI
int m_las_D_ADC[TileLaserObject::nbGains][TileLaserObject::nbDiodes] = {{0}};
float m_las_D_Ped[TileLaserObject::nbGains][TileLaserObject::nbDiodes] = {{0}};
float m_las_D_Ped_RMS[TileLaserObject::nbGains][TileLaserObject::nbDiodes] = {{0}};
float m_las_D_Alpha[TileLaserObject::nbGains][TileLaserObject::nbDiodes] = {{0}};
float m_las_D_Alpha_RMS[TileLaserObject::nbGains][TileLaserObject::nbDiodes] = {{0}};
float m_las_D_AlphaPed[TileLaserObject::nbGains][TileLaserObject::nbDiodes] = {{0}};
float m_las_D_AlphaPed_RMS[TileLaserObject::nbGains][TileLaserObject::nbDiodes] = {{0}};
int m_las_PMT_ADC[TileLaserObject::nbGains][TileLaserObject::nbPmts] = {{0}};
int m_las_PMT_TDC[TileLaserObject::nbGains][TileLaserObject::nbPmts] = {{0}};
float m_las_PMT_Ped[TileLaserObject::nbGains][TileLaserObject::nbPmts] = {{0}};
float m_las_PMT_Ped_RMS[TileLaserObject::nbGains][TileLaserObject::nbPmts] = {{0}};
// LASERII
int m_chan[32] = {0}; // Mean value for monitoring diodes, PMTs, phocal, CIS
float m_chan_Ped[32] = {0}; // Corresponding pedestal values
float m_chan_Led[32] = {0}; // Corresponding LED values
float m_chan_Lin[32] = {0}; // Corresponding linearity values
float m_chan_Alpha[32] = {0}; // Corresponding alpha peaks
float m_chan_SPed[32] = {0}; // Sigma of pedestal values
float m_chan_SLed[32] = {0}; // Sigma of LED values
float m_chan_SLin[32] = {0}; // Sigma of linearity values
float m_chan_SAlpha[32] = {0}; // Sigma of alpha peaks
// Digi/Energy items
short m_sampleFlt[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES] = {{{{0}}}};
short m_gainFlt[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
short m_sample[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES] = {{{{0}}}};
short m_gain[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
short m_rodBCID[N_ROS][N_MODULES] = {{0}};
short m_fragSize[N_ROS][N_MODULES] = {{0}};
uint16_t m_dmuMask[N_ROS][N_MODULES][2] = {{0}};
uint16_t m_slinkCRC[N_ROS][N_MODULES][2] = {{0}};
uint32_t m_DMUheader[N_ROS2][N_MODULES][N_DMUS] = {{{0}}};
short m_DMUbcid[N_ROS2][N_MODULES][N_DMUS] = {{{0}}};
short m_DMUformatErr[N_ROS2][N_MODULES][N_DMUS] = {{{0}}};
short m_DMUparityErr[N_ROS2][N_MODULES][N_DMUS] = {{{0}}};
short m_DMUmemoryErr[N_ROS2][N_MODULES][N_DMUS] = {{{0}}};
short m_DMUDstrobeErr[N_ROS2][N_MODULES][N_DMUS] = {{{0}}};
short m_DMUSstrobeErr[N_ROS2][N_MODULES][N_DMUS] = {{{0}}};
short m_feCRC[N_ROS2][N_MODULES][N_DMUS] = {{{0}}};
short m_rodCRC[N_ROS2][N_MODULES][N_DMUS] = {{{0}}};
float m_ene[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_time[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_ped[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_chi2[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_eFit[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_tFit[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_pedFit[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_chi2Fit[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_eFitc[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_tFitc[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_pedFitc[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_chi2Fitc[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_eOpt[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_tOpt[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_pedOpt[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_chi2Opt[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_eQIE[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_tQIE[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_pedQIE[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_chi2QIE[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_eOF1[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_tOF1[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_pedOF1[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_chi2OF1[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_eDsp[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_tDsp[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_pedDsp[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_chi2Dsp[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_eMF[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES] = {{{0}}};
float m_tMF[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES] = {{{0}}};
float m_chi2MF[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
float m_pedMF[N_ROS2][N_MODULES][N_CHANS] = {{{0}}};
short m_ROD_GlobalCRC[N_ROS][N_MODULES] = {{0}};
short m_ROD_BCID[N_ROS][N_MODULES] = {{0}};
short m_ROD_DMUBCIDErr[N_ROS][N_MODULES][N_DMUS] = {{{0}}};
short m_ROD_DMUmemoryErr[N_ROS][N_MODULES][N_DMUS] = {{{0}}};
short m_ROD_DMUSstrobeErr[N_ROS][N_MODULES][N_DMUS] = {{{0}}};
short m_ROD_DMUDstrobeErr[N_ROS][N_MODULES][N_DMUS] = {{{0}}};
short m_ROD_DMUHeadformatErr[N_ROS][N_MODULES][N_DMUS] = {{{0}}};
short m_ROD_DMUHeadparityErr[N_ROS][N_MODULES][N_DMUS] = {{{0}}};
short m_ROD_DMUDataformatErr[N_ROS][N_MODULES][N_DMUS] = {{{0}}};
short m_ROD_DMUDataparityErr[N_ROS][N_MODULES][N_DMUS] = {{{0}}};
short m_ROD_DMUfeCRC[N_ROS][N_MODULES][N_DMUS] = {{{0}}};
short m_ROD_DMUrodCRC[N_ROS][N_MODULES][N_DMUS] = {{{0}}};
uint16_t m_ROD_DMUMask[N_ROS][N_MODULES][2] = {{{0}}};
float m_eTMDB[N_ROS][N_MODULES][N_TMDBCHANS] = {{{0}}}; // TMDB
unsigned char m_sampleTMDB[N_ROS][N_MODULES][N_TMDBCHANS][N_SAMPLES] = {{{{0}}}}; // TMDB
unsigned char m_decisionTMDB[N_ROS][N_MODULES][N_TMDBDECISIONS] = {{{0}}}; // TMDB
float m_TEMP[4][64][7];
float m_HV[4][64][48];
float m_HVSET[4][64][48];
int m_DRSTATES[4][64];
short m_HVSTATUS[4][64][48];
short m_DRSTATUS[4][64];
short m_CHSTATUS[4][64][48];
float m_TEMP[4][64][7] = {{{0}}};
float m_HV[4][64][48] = {{{0}}};
float m_HVSET[4][64][48] = {{{0}}};
int m_DRSTATES[4][64] = {{0}};
short m_HVSTATUS[4][64][48] = {{{0}}};
short m_DRSTATUS[4][64] = {{0}};
short m_CHSTATUS[4][64][48] = {{{0}}};
};
std::unique_ptr<Arrays> m_arrays;
int m_daqtype;
int m_nBadDr;
int m_nBadHV;
int m_nBadDCS;
......
TileCalorimeter/TileRec/src/TileAANtuple.cxx
+ 505
− 602
View file @ cf282226
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment