@@ -390,10 +390,6 @@ struct EmcalCorrectionTask {
390390 }
391391 }
392392
393- auto hClusters = mHistManager .add <TH1 >(" hClusters" , " hClusters" , O2HistType::kTH1D , {{2 , -0.5 , 1.5 }});
394- hClusters->GetXaxis ()->SetBinLabel (1 , " all clusters" );
395- hClusters->GetXaxis ()->SetBinLabel (2 , " cross boundary cluster" );
396-
397393 // For some runs, LG cells require an extra time shift of 2 * 8.8ns due to problems in the time calibration
398394 // Affected run ranges (inclusive) are initialised here (min,max)
399395 mExtraTimeShiftRunRanges .emplace_back (535365 , 535645 ); // LHC23g-LHC23h
@@ -538,7 +534,7 @@ struct EmcalCorrectionTask {
538534
539535 // Store the clusters in the table where a matching collision could
540536 // be identified.
541- fillClusterTable<CollEventSels::filtered_iterator>(col, vertexPos, iClusterizer, cellIndicesBC, cells, &indexMapPair, &trackGlobalIndex, nullptr , nullptr );
537+ fillClusterTable<CollEventSels::filtered_iterator>(col, vertexPos, iClusterizer, cellIndicesBC, &indexMapPair, &trackGlobalIndex, nullptr , nullptr );
542538 } else {
543539 mHistManager .fill (HIST (" hBCMatchErrors" ), 2 );
544540 }
@@ -705,7 +701,7 @@ struct EmcalCorrectionTask {
705701
706702 // Store the clusters in the table where a matching collision could
707703 // be identified.
708- fillClusterTable<CollEventSels::filtered_iterator>(col, vertexPos, iClusterizer, cellIndicesBC, cells, &indexMapPair, &trackGlobalIndex, &indexMapPairSecondary, &secondaryGlobalIndex);
704+ fillClusterTable<CollEventSels::filtered_iterator>(col, vertexPos, iClusterizer, cellIndicesBC, &indexMapPair, &trackGlobalIndex, &indexMapPairSecondary, &secondaryGlobalIndex);
709705 } else {
710706 mHistManager .fill (HIST (" hBCMatchErrors" ), 2 );
711707 }
@@ -904,7 +900,7 @@ struct EmcalCorrectionTask {
904900
905901 // Store the clusters in the table where a matching collision could
906902 // be identified.
907- fillClusterTable<CollEventSels::filtered_iterator>(col, vertexPos, iClusterizer, cellIndicesBC, cells, &indexMapPair, &trackGlobalIndex);
903+ fillClusterTable<CollEventSels::filtered_iterator>(col, vertexPos, iClusterizer, cellIndicesBC, &indexMapPair, &trackGlobalIndex);
908904 } else {
909905 mHistManager .fill (HIST (" hBCMatchErrors" ), 2 );
910906 }
@@ -1103,7 +1099,7 @@ struct EmcalCorrectionTask {
11031099
11041100 // Store the clusters in the table where a matching collision could
11051101 // be identified.
1106- fillClusterTable<CollEventSels::filtered_iterator>(col, vertexPos, iClusterizer, cellIndicesBC, cells, &indexMapPair, &trackGlobalIndex, &indexMapPairSecondary, &secondaryGlobalIndex);
1102+ fillClusterTable<CollEventSels::filtered_iterator>(col, vertexPos, iClusterizer, cellIndicesBC, &indexMapPair, &trackGlobalIndex, &indexMapPairSecondary, &secondaryGlobalIndex);
11071103 } else {
11081104 mHistManager .fill (HIST (" hBCMatchErrors" ), 2 );
11091105 }
@@ -1251,7 +1247,7 @@ struct EmcalCorrectionTask {
12511247
12521248 // Store the clusters in the table where a matching collision could
12531249 // be identified.
1254- fillClusterTable<aod::Collision>(col, vertexPos, iClusterizer, cellIndicesBC, cells );
1250+ fillClusterTable<aod::Collision>(col, vertexPos, iClusterizer, cellIndicesBC);
12551251 }
12561252 } else { // ambiguous
12571253 // LOG(warning) << "No vertex found for event. Assuming (0,0,0).";
@@ -1320,8 +1316,8 @@ struct EmcalCorrectionTask {
13201316 LOG (debug) << " Converted to analysis clusters." ;
13211317 }
13221318
1323- template <o2::soa::is_iterator Collision, o2::soa::is_table Cells >
1324- void fillClusterTable (Collision const & col, math_utils::Point3D<float > const & vertexPos, size_t iClusterizer, const gsl::span<int64_t > cellIndicesBC, Cells const & cells, MatchResult* indexMapPair = nullptr , const std::vector<int64_t >* trackGlobalIndex = nullptr , MatchResult* indexMapPairSecondaries = nullptr , const std::vector<int64_t >* secondariesGlobalIndex = nullptr )
1319+ template <o2::soa::is_iterator Collision>
1320+ void fillClusterTable (Collision const & col, math_utils::Point3D<float > const & vertexPos, size_t iClusterizer, const gsl::span<int64_t > cellIndicesBC, MatchResult* indexMapPair = nullptr , const std::vector<int64_t >* trackGlobalIndex = nullptr , MatchResult* indexMapPairSecondaries = nullptr , const std::vector<int64_t >* secondariesGlobalIndex = nullptr )
13251321 {
13261322 // get the clusterType once
13271323 const auto clusterType = static_cast <int >(mClusterDefinitions [iClusterizer]);
@@ -1359,38 +1355,14 @@ struct EmcalCorrectionTask {
13591355 clusterType);
13601356 dispersions (cluster.getDispersion ());
13611357 ++nCluster;
1362- mHistManager .fill (HIST (" hClusters" ), 0 );
13631358 if (!mClusterLabels .empty ()) {
13641359 mcclusters (mClusterLabels [iCluster].getLabels (), mClusterLabels [iCluster].getEnergyFractions ());
13651360 }
1366- // loop over cells in cluster and save to table
1367- bool hasLargeDispersion = cluster.getDispersion () > 8 ;
1368- if (hasLargeDispersion) {
1369- mHistManager .fill (HIST (" hClusters" ), 1 );
1370- LOG (info) << " Found cluster with large dispersion = " << cluster.getDispersion () << " \t M02 = " << cluster.getM02 () << " \t NCells = " << cluster.getNCells ();
1371- }
13721361 for (int ncell = 0 ; ncell < cluster.getNCells (); ncell++) {
13731362 cellindex = cluster.getCellIndex (ncell);
13741363 LOG (debug) << " trying to find cell index " << cellindex << " in map" ;
13751364 if (cellIndicesBC[cellindex] >= 0 ) {
13761365 clustercells (clusters.lastIndex (), cellIndicesBC[cellindex]);
1377- auto cellGlobalIndex = cellIndicesBC[cellindex];
1378-
1379- if (hasLargeDispersion) {
1380- auto theCell = cells.rawIteratorAt (cellGlobalIndex);
1381- auto towerId = theCell.cellNumber ();
1382-
1383- auto [nSupMod, nModule, nIphi, nIeta] = geometry->GetCellIndex (towerId);
1384- auto [iphiLocal, ietaLocal] = geometry->GetCellPhiEtaIndexInSModule (nSupMod, nModule, nIphi, nIeta);
1385- auto [rowGlobal, colGlobal] = geometry->GlobalRowColFromIndex (towerId);
1386-
1387- LOG (info) << " Cell globalIndex = " << cellGlobalIndex
1388- << " towerId = " << towerId
1389- << " SM = " << nSupMod
1390- << " local(eta, phi) = (" << ietaLocal << " , " << iphiLocal << " )"
1391- << " global(eta, phi) = (" << colGlobal << " , " << rowGlobal << " )"
1392- << " E = " << theCell.amplitude ();
1393- }
13941366 ++nCells;
13951367 }
13961368 } // end of cells of cluser loop
0 commit comments