@@ -242,7 +242,7 @@ void Detector::createMaterials()
242242 tmaxfd3, stepmax, deemax, epsil, stepmin);
243243
244244 // Cherenkov radiator glass, modify fieldType and maxField parameters
245- fieldType = 2 ;
245+ fieldType = 2 ;
246246 maxField = 10 .;
247247
248248 // Radiator glass SiO2
@@ -274,15 +274,9 @@ void Detector::buildModules()
274274
275275 TGeoVolumeAssembly *vFD3_ScintA, *vFD3_ScintC, *vFD3_CherA, *vFD3_CherC;
276276
277- if (baseParam.isSymmetric ) {
278- vFD3_ScintA = buildModuleScint (Constants::etaMin, Constants::etaMax);
279- vFD3_CherA = buildModuleCherenkov_v1 ();
280- } else {
281- vFD3_ScintA = buildModuleScint (Constants::etaMin, Constants::etaMax2);
282- vFD3_CherA = buildModuleCherenkov_v2 ();
283- }
284-
277+ vFD3_ScintA = buildModuleScint (Constants::etaMin, baseParam.isSymmetric ? Constants::etaMax : Constants::etaMax2);
285278 vFD3_ScintC = buildModuleScint (Constants::etaMin, Constants::etaMax);
279+ vFD3_CherA = baseParam.isSymmetric ? buildModuleCherenkov_v1 () : buildModuleCherenkov_v2 ();
286280 vFD3_CherC = buildModuleCherenkov_v1 ();
287281
288282 vFD3_ScintA->SetName (" FD3_ScintA" );
@@ -299,7 +293,7 @@ void Detector::buildModules()
299293
300294TGeoVolumeAssembly* Detector::buildModuleScint (float etaMin, float etaMax)
301295{
302- auto mod = new TGeoVolumeAssembly (" FD3_Scint " );
296+ auto mod = new TGeoVolumeAssembly (" " );
303297
304298 const TGeoMedium* medium = gGeoManager ->GetMedium (" FD3_Scintillator" );
305299
@@ -332,7 +326,7 @@ TGeoVolumeAssembly* Detector::buildModuleScint(float etaMin, float etaMax)
332326
333327TGeoVolumeAssembly* Detector::buildModuleCherenkov_v1 ()
334328{
335- auto mod = new TGeoVolumeAssembly (" FD3_Ch " );
329+ auto mod = new TGeoVolumeAssembly (" " );
336330
337331 TGeoMedium* medium = gGeoManager ->GetMedium (" FD3_Glass" );
338332
@@ -368,7 +362,7 @@ TGeoVolumeAssembly* Detector::buildModuleCherenkov_v1()
368362
369363TGeoVolumeAssembly* Detector::buildModuleCherenkov_v2 ()
370364{
371- auto mod = new TGeoVolumeAssembly (" FD3_Ch " );
365+ auto mod = new TGeoVolumeAssembly (" " );
372366
373367 TGeoMedium* medium = gGeoManager ->GetMedium (" FD3_Glass" );
374368
0 commit comments