forked from key4hep/k4geo
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from MuonColliderSoft/master
Updated to iLCSoft master. Fixed double thickness in the negative side of TrackerEndcapSupport
- Loading branch information
Showing
13 changed files
with
206 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| # Compiled Object files | ||
| *.slo | ||
| *.lo | ||
| *.o | ||
| *.obj | ||
| *.pyc | ||
|
|
||
| # Precompiled Headers | ||
| *.gch | ||
| *.pch | ||
|
|
||
| # Compiled Dynamic libraries | ||
| *.so | ||
| *.dylib | ||
| *.dll | ||
|
|
||
| # Fortran module files | ||
| *.mod | ||
| *.smod | ||
|
|
||
| # Compiled Static libraries | ||
| *.lai | ||
| *.la | ||
| *.a | ||
| *.lib | ||
|
|
||
| # Executables | ||
| *.exe | ||
| *.out | ||
| *.app | ||
|
|
||
| # Build and install directories | ||
| bin/ | ||
| lib/ | ||
| /include | ||
| /python/ | ||
| build/ | ||
|
|
||
| # CMake config files | ||
| *Config.cmake | ||
| *ConfigVersion.cmake | ||
| Version.h | ||
|
|
||
| # emacs backup files | ||
| *~ | ||
|
|
||
| *.DS_Store | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| #include "OtherDetectorHelpers.h" | ||
|
|
||
| #include "DD4hep/DetFactoryHelper.h" | ||
| #include "DD4hep/DD4hepUnits.h" | ||
| #include "DDRec/DetectorData.h" | ||
| #include "DDRec/Surface.h" | ||
| #include "XML/Utilities.h" | ||
| #include "XMLHandlerDB.h" | ||
| #include <cmath> | ||
| #include <map> | ||
| #include <string> | ||
|
|
||
| using namespace std; | ||
|
|
||
| using dd4hep::Assembly; | ||
| using dd4hep::ConeSegment; | ||
| using dd4hep::Material; | ||
| using dd4hep::PlacedVolume; | ||
| using dd4hep::Position; | ||
| using dd4hep::Ref_t; | ||
| using dd4hep::RotateY; | ||
| using dd4hep::RotationY; | ||
| using dd4hep::Solid; | ||
| using dd4hep::SubtractionSolid; | ||
| using dd4hep::Transform3D; | ||
| using dd4hep::Tube; | ||
| using dd4hep::Volume; | ||
| using dd4hep::Detector; | ||
| using dd4hep::SensitiveDetector; | ||
| using dd4hep::DetElement; | ||
| using dd4hep::BUILD_ENVELOPE; | ||
| using dd4hep::_toString; | ||
|
|
||
| using dd4hep::rec::Vector3D; | ||
| using dd4hep::rec::VolSurfaceHandle; | ||
| using dd4hep::rec::VolPlaneImpl; | ||
| using dd4hep::rec::SurfaceType; | ||
| using dd4hep::rec::volSurfaceList; | ||
|
|
||
| static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector) | ||
| { | ||
| xml_det_t x_det = e; | ||
| int det_id = x_det.id(); | ||
| string det_name = x_det.nameStr(); | ||
| DetElement sdet(det_name, det_id); | ||
| string side_name[2] = {"_pos", "_neg"}; | ||
| double side_sign[2] = {+1., -1.}; | ||
|
|
||
| Volume envelope = dd4hep::xml::createPlacedEnvelope(theDetector, e , sdet) ; | ||
|
|
||
| if (theDetector.buildType() == BUILD_ENVELOPE) return sdet ; | ||
|
|
||
| Material air = theDetector.air(); | ||
| bool reflect = x_det.reflect(); | ||
|
|
||
| PlacedVolume pv; | ||
| int l_num = 0; | ||
|
|
||
| for (xml_coll_t i(x_det, _U(layer)); i; ++i, ++l_num) { | ||
| xml_comp_t x_layer = i; | ||
| string l_nam = det_name + _toString(l_num, "_layer%d"); | ||
| double zmin = x_layer.inner_z(); | ||
| double rmin = x_layer.inner_r(); | ||
| double rmax = x_layer.outer_r(); | ||
| double z = zmin, layerWidth = 0.; | ||
| int s_num = 0; | ||
|
|
||
| for (xml_coll_t j(x_layer, _U(slice)); j; ++j) { | ||
| double thickness = xml_comp_t(j).thickness(); | ||
| layerWidth += thickness; | ||
| } | ||
| Tube l_tub(rmin, rmax, layerWidth, 2 * M_PI); | ||
| Volume l_vol(l_nam, l_tub, air); | ||
| l_vol.setVisAttributes(theDetector, x_layer.visStr()); | ||
|
|
||
| // Creating the original and reflected sides in a loop | ||
| for (size_t side=0; side < 2; ++side) { | ||
| // Stopping after the original if reflection is disabled | ||
| if (side > 0 && !reflect) break; | ||
|
|
||
| DetElement layer(sdet, l_nam + side_name[side], l_num); | ||
|
|
||
| for (xml_coll_t j(x_layer, _U(slice)); j; ++j, ++s_num) { | ||
| xml_comp_t x_slice = j; | ||
| double thick = x_slice.thickness(); | ||
| Material mat = theDetector.material(x_slice.materialStr()); | ||
| string s_nam = l_nam + _toString(s_num, "_slice%d"); | ||
| Volume s_vol(s_nam, Tube(rmin, rmax, thick/2.), mat); //NN: Tube is a MyConeSeg, takes half thickness | ||
|
|
||
| //Add surface to the support | ||
| double mid_r = 0.5 * ( rmin + rmax ) ; | ||
| Vector3D ocyl( 0., mid_r , 0. ); | ||
| Vector3D u(1.,0.,0.), v(0.,1.,0.), n(0.,0.,1.); | ||
|
|
||
| VolSurfaceHandle<VolPlaneImpl> cylSurf( s_vol , SurfaceType( SurfaceType::Helper ) , 0.5*thick , 0.5*thick , u, v, side_sign[side]*n, side_sign[side]*ocyl ); | ||
| volSurfaceList( layer )->push_back( cylSurf ); | ||
|
|
||
|
|
||
| s_vol.setAttributes(theDetector, x_slice.regionStr(), x_slice.limitsStr(), x_slice.visStr()); | ||
| pv = l_vol.placeVolume(s_vol, Position(0, 0, side_sign[side]*(z - zmin - layerWidth / 2 + thick / 2))); | ||
| pv.addPhysVolID("sensor", s_num); | ||
| } | ||
|
|
||
| pv = envelope.placeVolume(l_vol, Position(0, 0, side_sign[side]*(zmin + layerWidth / 2.))); | ||
| pv.addPhysVolID("layer", l_num); | ||
| pv.addPhysVolID("barrel", side+1); | ||
| layer.setPlacement(pv); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| return sdet; | ||
| } | ||
|
|
||
| DECLARE_DETELEMENT(TrackerEndcapSupport_o1_v02, create_detector) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters