2525#define ENABLE_UPGRADES
2626#include "DetectorsCommonDataFormats/DetID.h"
2727#include "ITSMFTBase/SegmentationAlpide.h"
28- #include "ITS3Base/SegmentationSuperAlpide .h"
28+ #include "ITS3Base/SegmentationMosaix .h"
2929#include "ITS3Base/SpecsV2.h"
3030#include "ITSBase/GeometryTGeo.h"
3131#include "DataFormatsITSMFT/CompCluster.h"
@@ -50,15 +50,15 @@ void CheckClustersITS3(const std::string& clusfile = "o2clus_its.root",
5050 using namespace o2 ::base ;
5151 using namespace o2 ::its ;
5252
53- using SuperSegmentation = o2 ::its3 ::SegmentationSuperAlpide ;
53+ using MosaixSegmentation = o2 ::its3 ::SegmentationMosaix ;
5454 using Segmentation = o2 ::itsmft ::SegmentationAlpide ;
5555 using o2 ::itsmft ::CompClusterExt ;
5656 using o2 ::itsmft ::Hit ;
5757 using ROFRec = o2 ::itsmft ::ROFRecord ;
5858 using MC2ROF = o2 ::itsmft ::MC2ROFRecord ;
5959 using HitVec = std ::vector < Hit > ;
6060 using MC2HITS_map = std ::unordered_map < uint64_t , int > ; // maps (track_ID<<32 + chip_ID) to entry in the hit vector
61- std ::array < SuperSegmentation , 3 > mSuperSegmentations {0 , 1 , 2 };
61+ std ::array < MosaixSegmentation , 3 > mMosaixSegmentations {0 , 1 , 2 };
6262
6363 std ::vector < HitVec * > hitVecPool ;
6464 std ::vector < MC2HITS_map > mc2hitVec ;
@@ -185,8 +185,8 @@ void CheckClustersITS3(const std::string& clusfile = "o2clus_its.root",
185185 locC = dict .getClusterCoordinates (cluster );
186186 errX = dict .getErrX (pattID );
187187 errZ = dict .getErrZ (pattID );
188- errX *= (isIB ) ? SuperSegmentation ::mPitchRow : Segmentation ::PitchRow ;
189- errZ *= (isIB ) ? SuperSegmentation ::mPitchCol : Segmentation ::PitchCol ;
188+ errX *= (isIB ) ? MosaixSegmentation ::mPitchRow : Segmentation ::PitchRow ;
189+ errZ *= (isIB ) ? MosaixSegmentation ::mPitchCol : Segmentation ::PitchCol ;
190190 npix = dict .getNpixels (pattID );
191191 ++ cPattValid ;
192192 }
@@ -235,21 +235,16 @@ void CheckClustersITS3(const std::string& clusfile = "o2clus_its.root",
235235 } else {
236236 // compare in local flat coordinates
237237 float xFlatEnd {0. }, yFlatEnd {0. };
238- mSuperSegmentations [layer ].curvedToFlat (locH .X (), locH .Y (), xFlatEnd , yFlatEnd );
238+ mMosaixSegmentations [layer ].curvedToFlat (locH .X (), locH .Y (), xFlatEnd , yFlatEnd );
239239 locH .SetXYZ (xFlatEnd , yFlatEnd , locH .Z ());
240240 float xFlatSta {0. }, yFlatSta {0. };
241- mSuperSegmentations [layer ].curvedToFlat (locHsta .X (), locHsta .Y (), xFlatSta , yFlatSta );
241+ mMosaixSegmentations [layer ].curvedToFlat (locHsta .X (), locHsta .Y (), xFlatSta , yFlatSta );
242242 locHsta .SetXYZ (xFlatSta , yFlatSta , locHsta .Z ());
243- // recalculate x/y in flat
244- // x0 = xFlatSta, dltx = xFlatEnd - x0;
245- // y0 = yFlatSta, dlty = yFlatEnd - y0;
246- // r = (0.5 * (SuperSegmentation::mSensorLayerThickness - SuperSegmentation::mSensorLayerThicknessEff) - y0) / dlty;
247- // locH.SetXYZ(x0 + r * dltx, y0 + r * dlty, z0 + r * dltz);
248243
249244 // not really precise, but okish
250245 locH .SetXYZ (0.5f * (locH .X () + locHsta .X ()), 0.5f * (locH .Y () + locHsta .Y ()), 0.5f * (locH .Z () + locHsta .Z ()));
251246
252- mSuperSegmentations [layer ].curvedToFlat (locC .X (), locC .Y (), xFlatSta , yFlatSta );
247+ mMosaixSegmentations [layer ].curvedToFlat (locC .X (), locC .Y (), xFlatSta , yFlatSta );
253248 locC .SetXYZ (xFlatSta , yFlatSta , locC .Z ());
254249 }
255250 float theta = std ::acos (gloC .Z () / gloC .Rho ());
0 commit comments