Skip to content
Snippets Groups Projects
Commit c06ef2d5 authored by christopher dilks's avatar christopher dilks
Browse files

test overlap checker for small dRICH sensor overlaps 

- disable all of the dRICH optics except for two sensors, which have a small overlap
- there is at least one such overlap per sector
- these overlaps were not identified by our CI overlap checks, so we
  test again here, with the dRICH restricted to being composed of 2 such
  overlapping sensors
- the overlap are clearly visible in jsROOT (if you zoom in closely);
  see the dRICH-only subsystem view
parent b7b6636c
Branches
Tags
1 merge request!352Draft: test overlap checker for small dRICH sensor overlaps
Hide whitespace changes
Inline Side-by-side
Showing
with 91 additions and 89 deletions
src/DRICH_geo.cpp
+ 91
− 89
View file @ c06ef2d5
...@@ -330,57 +330,57 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec ...@@ -330,57 +330,57 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
// TODO [low-priority]: define skin properties for aerogel and filter // TODO [low-priority]: define skin properties for aerogel and filter
auto radiatorPos = Position(0., 0., radiatorFrontplane) + originFront; auto radiatorPos = Position(0., 0., radiatorFrontplane) + originFront;
//printf("@@@ %f\n", (1/mm)*radiatorPos.z()); //printf("@@@ %f\n", (1/mm)*radiatorPos.z());
auto aerogelPV = gasvolVol.placeVolume(aerogelVol, //auto aerogelPV = gasvolVol.placeVolume(aerogelVol,
Translation3D(radiatorPos.x(), radiatorPos.y(), radiatorPos.z()) // re-center to originFront // Translation3D(radiatorPos.x(), radiatorPos.y(), radiatorPos.z()) // re-center to originFront
* RotationY(radiatorPitch) // change polar angle to specified pitch // FIXME: probably broken (not yet in use anyway) // * RotationY(radiatorPitch) // change polar angle to specified pitch // FIXME: probably broken (not yet in use anyway)
); // );
DetElement aerogelDE(det, "aerogel_de", 0); //DetElement aerogelDE(det, "aerogel_de", 0);
aerogelDE.setPlacement(aerogelPV); //aerogelDE.setPlacement(aerogelPV);
//SkinSurface aerogelSkin(desc, aerogelDE, "mirror_optical_surface", aerogelSurf, aerogelVol); ////SkinSurface aerogelSkin(desc, aerogelDE, "mirror_optical_surface", aerogelSurf, aerogelVol);
//aerogelSkin.isValid(); ////aerogelSkin.isValid();
#ifdef WITH_IRT //#ifdef WITH_IRT
{ //{
//printf("@@@ %f\n", (1/mm)*(gasvolume2master.z() + aerogelPV.position().z()));//+aerogelThickness/2)); // //printf("@@@ %f\n", (1/mm)*(gasvolume2master.z() + aerogelPV.position().z()));//+aerogelThickness/2));
//auto surface = new FlatSurface((1/mm)*TVector3(0,0,vesselOffset+aerogelPV.position().z()+aerogelThickness/2), nx, ny); // //auto surface = new FlatSurface((1/mm)*TVector3(0,0,vesselOffset+aerogelPV.position().z()+aerogelThickness/2), nx, ny);
auto surface = new FlatSurface((1/mm)*TVector3(0,0,gasvolume2master.z() + aerogelPV.position().z()), nx, ny); // auto surface = new FlatSurface((1/mm)*TVector3(0,0,gasvolume2master.z() + aerogelPV.position().z()), nx, ny);
//printf("@M@ aerogel %7.2f\n", (vesselOffset+aerogelPV.position().z()+aerogelThickness/2)/mm); // //printf("@M@ aerogel %7.2f\n", (vesselOffset+aerogelPV.position().z()+aerogelThickness/2)/mm);
// This call will create a pair of flat refractive surfaces internally; FIXME: should make // // This call will create a pair of flat refractive surfaces internally; FIXME: should make
// a small gas gap at the upstream end of the gas volume; // // a small gas gap at the upstream end of the gas volume;
for(int isec=0; isec<nmax/*nSectors*/; isec++) { // for(int isec=0; isec<nmax/*nSectors*/; isec++) {
auto radiator = geometry->AddFlatRadiator(detector, "Aerogel", isec, // auto radiator = geometry->AddFlatRadiator(detector, "Aerogel", isec,
(G4LogicalVolume*)(0x1), 0, surface, aerogelThickness/mm); //(G4LogicalVolume*)(0x1), 0, surface, aerogelThickness/mm);
radiator->SetAlternativeMaterialName(aerogelMat.ptr()->GetName()); // radiator->SetAlternativeMaterialName(aerogelMat.ptr()->GetName());
} //for isec // } //for isec
} //}
#endif //#endif
// filter placement and surface properties // filter placement and surface properties
if(!debug_optics) { //if(!debug_optics) {
auto filterPV = gasvolVol.placeVolume(filterVol, // auto filterPV = gasvolVol.placeVolume(filterVol,
Translation3D(0., 0., airGap) // add an air gap // Translation3D(0., 0., airGap) // add an air gap
* Translation3D(radiatorPos.x(), radiatorPos.y(), radiatorPos.z()) // re-center to originFront // * Translation3D(radiatorPos.x(), radiatorPos.y(), radiatorPos.z()) // re-center to originFront
* RotationY(radiatorPitch) // change polar angle // * RotationY(radiatorPitch) // change polar angle
* Translation3D(0., 0., (aerogelThickness+filterThickness)/2.) // move to aerogel backplane // * Translation3D(0., 0., (aerogelThickness+filterThickness)/2.) // move to aerogel backplane
); // );
DetElement filterDE(det, "filter_de", 0); // DetElement filterDE(det, "filter_de", 0);
filterDE.setPlacement(filterPV); // filterDE.setPlacement(filterPV);
//SkinSurface filterSkin(desc, filterDE, "mirror_optical_surface", filterSurf, filterVol); // //SkinSurface filterSkin(desc, filterDE, "mirror_optical_surface", filterSurf, filterVol);
//filterSkin.isValid(); // //filterSkin.isValid();
#ifdef WITH_IRT //#ifdef WITH_IRT
{ // {
// FIXME: create a small air gap in the geometry as well; // // FIXME: create a small air gap in the geometry as well;
//printf("@@@ %f\n", (1/mm)*(gasvolume2master.z() + filterPV.position().z())); // //printf("@@@ %f\n", (1/mm)*(gasvolume2master.z() + filterPV.position().z()));
auto surface = new FlatSurface((1/mm)*TVector3(0,0,gasvolume2master.z() + filterPV.position().z()), nx, ny); // auto surface = new FlatSurface((1/mm)*TVector3(0,0,gasvolume2master.z() + filterPV.position().z()), nx, ny);
for(int isec=0; isec<nmax/*nSectors*/; isec++) { // for(int isec=0; isec<nmax/*nSectors*/; isec++) {
auto radiator = geometry->AddFlatRadiator(detector, "Filter", isec, //auto radiator = geometry->AddFlatRadiator(detector, "Filter", isec,
(G4LogicalVolume*)(0x2), 0, surface, filterThickness/mm); //(G4LogicalVolume*)(0x2), 0, surface, filterThickness/mm);
radiator->SetAlternativeMaterialName(filterMat.ptr()->GetName()); //radiator->SetAlternativeMaterialName(filterMat.ptr()->GetName());
} //for isec // } //for isec
} // }
#endif //#endif
}; //};
// SECTOR LOOP ////////////////////////////////// // SECTOR LOOP //////////////////////////////////
...@@ -497,48 +497,48 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec ...@@ -497,48 +497,48 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
// mirror volume, attributes, and placement // mirror volume, attributes, and placement
Volume mirrorVol(detName+"_mirror_"+secName, mirrorSolid2, mirrorMat); Volume mirrorVol(detName+"_mirror_"+secName, mirrorSolid2, mirrorMat);
mirrorVol.setVisAttributes(mirrorVis); mirrorVol.setVisAttributes(mirrorVis);
auto mirrorPV2 = gasvolVol.placeVolume(mirrorVol, //auto mirrorPV2 = gasvolVol.placeVolume(mirrorVol,
RotationZ(sectorRotation) // rotate about beam axis to sector // RotationZ(sectorRotation) // rotate about beam axis to sector
* Translation3D(0,0,0) // * Translation3D(0,0,0)
); // );
{ //{
Transform3D slice2gasvolume = RotationZ(sectorRotation)*Translation3D(0,0,0); // Transform3D slice2gasvolume = RotationZ(sectorRotation)*Translation3D(0,0,0);
{ // {
auto translation = (slice2gasvolume*mirrorPlacement).Translation();//.Vect(); //auto translation = (slice2gasvolume*mirrorPlacement).Translation();//.Vect();
//auto x = (trans * (Position(0, 0, vesselZmin) - originFront)).Translation();//.Vect(); ////auto x = (trans * (Position(0, 0, vesselZmin) - originFront)).Translation();//.Vect();
//auto rotation = trans.Rotation(); ////auto rotation = trans.Rotation();
//const TGeoMatrix& localToGlobal = filterDE.nominal().worldTransformation(); ////const TGeoMatrix& localToGlobal = filterDE.nominal().worldTransformation();
//localToGlobal.LocalToMaster(l, g); ////localToGlobal.LocalToMaster(l, g);
double xx, yy, zz; //double xx, yy, zz;
translation.GetComponents(xx, yy, zz); //translation.GetComponents(xx, yy, zz);
//printf("@@@ %10.5f %10.5f %10.5f\n", xx/mm, yy/mm, zz/mm); ////printf("@@@ %10.5f %10.5f %10.5f\n", xx/mm, yy/mm, zz/mm);
#ifdef WITH_IRT //#ifdef WITH_IRT
auto surface = new SphericalSurface((1/mm)*TVector3( //auto surface = new SphericalSurface((1/mm)*TVector3(
xx+gasvolume2master.x(), //xx+gasvolume2master.x(),
yy+gasvolume2master.y(), //yy+gasvolume2master.y(),
zz+gasvolume2master.z()), //zz+gasvolume2master.z()),
mirrorRadius/mm); //mirrorRadius/mm);
//#if _TODAY_ ////#if _TODAY_
detector->AddOpticalBoundary(isec, new OpticalBoundary(detector->GetContainerVolume(), surface, false)); //detector->AddOpticalBoundary(isec, new OpticalBoundary(detector->GetContainerVolume(), surface, false));
// Complete the radiator volume description; this is the rear side of the container gas volume; //// Complete the radiator volume description; this is the rear side of the container gas volume;
detector->GetRadiator("GasVolume")->m_Borders[isec].second = surface; //detector->GetRadiator("GasVolume")->m_Borders[isec].second = surface;
//#endif ////#endif
#endif //#endif
} // }
auto mirrorPV2 = gasvolVol.placeVolume(mirrorVol, slice2gasvolume); // rotate about beam axis to sector // auto mirrorPV2 = gasvolVol.placeVolume(mirrorVol, slice2gasvolume); // rotate about beam axis to sector
//RotationZ(sectorRotation) // rotate about beam axis to sector // //RotationZ(sectorRotation) // rotate about beam axis to sector
// * Translation3D(0,0,0) // // * Translation3D(0,0,0)
// ); // // );
} //}
// properties //// properties
DetElement mirrorDE(det, Form("mirror_de%d", isec), isec); //DetElement mirrorDE(det, Form("mirror_de%d", isec), isec);
mirrorDE.setPlacement(mirrorPV2); //mirrorDE.setPlacement(mirrorPV2);
SkinSurface mirrorSkin(desc, mirrorDE, Form("mirror_optical_surface%d", isec), mirrorSurf, mirrorVol); //SkinSurface mirrorSkin(desc, mirrorDE, Form("mirror_optical_surface%d", isec), mirrorSurf, mirrorVol);
mirrorSkin.isValid(); //mirrorSkin.isValid();
// BUILD SENSORS ==================================================================== // BUILD SENSORS ====================================================================
...@@ -628,6 +628,7 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec ...@@ -628,6 +628,7 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
// placement (note: transformations are in reverse order) // placement (note: transformations are in reverse order)
// - transformations operate on global coordinates; the corresponding // - transformations operate on global coordinates; the corresponding
// generator coordinates are provided in the comments // generator coordinates are provided in the comments
if((imod==1256 || imod==1257) && isec==0) { // DEBUG: restrict to overlapping sensors
auto sensorPV = gasvolVol.placeVolume(sensorVol, auto sensorPV = gasvolVol.placeVolume(sensorVol,
RotationZ(sectorRotation) // rotate about beam axis to sector RotationZ(sectorRotation) // rotate about beam axis to sector
* Translation3D(sensorSphPos.x(), sensorSphPos.y(), sensorSphPos.z()) // move sphere to reference position * Translation3D(sensorSphPos.x(), sensorSphPos.y(), sensorSphPos.z()) // move sphere to reference position
...@@ -681,6 +682,7 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec ...@@ -681,6 +682,7 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
}; };
} }
} }
}; // END DEBUG: restrict to overlapping sensors
// increment sensor module number // increment sensor module number
imod++; imod++;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment