Skip to content

GDML v02 04 #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bear-is-asleep merged 9 commits into from
Apr 1, 2025
Merged

GDML v02 04 #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
02a24ed
Add copy of GDML v02_03
henrylay97 Mar 7, 2025
ecb8643
Adjust wall positions
henrylay97 Mar 7, 2025
8c558cf
Parse GDML
henrylay97 Mar 7, 2025
ffa98ec
Update references to gdml
henrylay97 Mar 7, 2025
bdfbc01
Correct naming
henrylay97 Mar 17, 2025
550e2d6
Finally stop using silly breakable if statements for module orientation
henrylay97 Mar 18, 2025
de1e1f5
Update genie_sbnd.fcl
henrylay97 Mar 25, 2025
b584146
Reference to TPC not cryostat
henrylay97 Mar 31, 2025
ac24a0a
Merge branch 'develop' into feature/hlay_gdml_v02_04
bear-is-asleep Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions sbndcode/Geometry/GeometryWrappers/CRTGeoAlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include "sbndcode/CRT/CRTUtils/CRTCommonUtils.h"
#include "sbndcode/ChannelMaps/CRT/CRTChannelMapService.h"
#include "sbndcode/Calibration/CRT/CalibService/CRTCalibService.h"
#include "sbndcode/Geometry/GeometryWrappers/CRTOrientationMaps.h"

namespace sbnd::crt {

Expand Down Expand Up @@ -168,18 +169,9 @@ namespace sbnd::crt {
double modulePosMother[3];
moduleNode->LocalToMaster(origin, modulePosMother);

if(CRTCommonUtils::GetTaggerEnum(taggerName) == kNorthTagger)
orientation = _adID == 70 || (modulePosMother[2] < 8.9);
else if(_minos || _adID == 139)
orientation = (modulePosMother[2] < 0);
else
orientation = (modulePosMother[2] > 0);

// Location of SiPMs
if(CRTCommonUtils::GetTaggerEnum(taggerName) == kSouthTagger || (CRTCommonUtils::GetTaggerEnum(taggerName) == kNorthTagger && _adID != 82))
top = (orientation == 0) ? (modulePosMother[1] < 0) : (modulePosMother[0] > 0);
else
top = (orientation == 1) ? (modulePosMother[1] < 0) : (modulePosMother[0] > 0);
CRTOrientationMaps orientationMaps;
orientation = orientationMaps.orientation.at(_adID);
top = orientationMaps.top.at(_adID);

// Fill edges
minX = std::min(limitsWorld.X(), limitsWorld2.X());
Expand Down
301 changes: 301 additions & 0 deletions sbndcode/Geometry/GeometryWrappers/CRTOrientationMaps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,301 @@
namespace sbnd::crt {
struct CRTOrientationMaps
{
public:
std::map<int, int> orientation = { { 0, 0 },
{ 1, 0 },
{ 2, 0 },
{ 3, 0 },
{ 4, 0 },
{ 5, 0 },
{ 6, 0 },
{ 7, 0 },
{ 8, 0 },
{ 9, 0 },
{ 10, 0 },
{ 11, 0 },
{ 12, 0 },
{ 13, 0 },
{ 14, 0 },
{ 15, 1 },
{ 16, 1 },
{ 17, 1 },
{ 18, 1 },
{ 19, 1 },
{ 20, 1 },
{ 21, 1 },
{ 22, 1 },
{ 23, 1 },
{ 24, 1 },
{ 25, 1 },
{ 26, 1 },
{ 27, 1 },
{ 28, 1 },
{ 29, 1 },
{ 30, 1 },
{ 31, 1 },
{ 32, 1 },
{ 33, 1 },
{ 34, 1 },
{ 35, 0 },
{ 36, 0 },
{ 37, 0 },
{ 38, 0 },
{ 39, 0 },
{ 40, 0 },
{ 41, 0 },
{ 42, 0 },
{ 43, 0 },
{ 44, 0 },
{ 45, 0 },
{ 46, 0 },
{ 47, 0 },
{ 48, 0 },
{ 49, 0 },
{ 50, 1 },
{ 51, 1 },
{ 52, 1 },
{ 53, 1 },
{ 54, 1 },
{ 55, 1 },
{ 56, 1 },
{ 57, 1 },
{ 58, 0 },
{ 59, 0 },
{ 60, 0 },
{ 61, 0 },
{ 62, 0 },
{ 63, 0 },
{ 64, 0 },
{ 65, 0 },
{ 66, 1 },
{ 67, 1 },
{ 68, 1 },
{ 69, 1 },
{ 70, 1 },
{ 71, 1 },
{ 72, 1 },
{ 73, 1 },
{ 74, 0 },
{ 75, 0 },
{ 76, 0 },
{ 77, 0 },
{ 78, 0 },
{ 79, 0 },
{ 80, 0 },
{ 81, 0 },
{ 82, 1 },
{ 83, 1 },
{ 84, 0 },
{ 85, 0 },
{ 86, 0 },
{ 87, 0 },
{ 88, 0 },
{ 89, 0 },
{ 90, 0 },
{ 91, 0 },
{ 92, 1 },
{ 93, 1 },
{ 94, 1 },
{ 95, 1 },
{ 96, 1 },
{ 97, 1 },
{ 98, 1 },
{ 99, 1 },
{ 100, 1 },
{ 101, 1 },
{ 102, 0 },
{ 103, 0 },
{ 104, 0 },
{ 105, 0 },
{ 106, 0 },
{ 107, 0 },
{ 108, 0 },
{ 109, 0 },
{ 110, 1 },
{ 111, 1 },
{ 112, 1 },
{ 113, 1 },
{ 114, 1 },
{ 115, 1 },
{ 116, 1 },
{ 117, 1 },
{ 118, 1 },
{ 119, 1 },
{ 120, 0 },
{ 121, 0 },
{ 122, 1 },
{ 123, 1 },
{ 124, 1 },
{ 125, 1 },
{ 126, 1 },
{ 127, 1 },
{ 128, 0 },
{ 129, 0 },
{ 130, 0 },
{ 131, 1 },
{ 132, 1 },
{ 133, 1 },
{ 134, 1 },
{ 135, 1 },
{ 136, 1 },
{ 137, 0 },
{ 138, 0 },
{ 139, 0 },
{ 140, 0 },
{ 141, 0 },
{ 142, 0 },
{ 143, 0 },
{ 144, 0 },
{ 145, 0 }
};

std::map<int, bool> top = { { 0, true },
{ 1, true },
{ 2, true },
{ 3, true },
{ 4, true },
{ 5, true },
{ 6, true },
{ 7, true },
{ 8, true },
{ 9, true },
{ 10, false },
{ 11, false },
{ 12, false },
{ 13, false },
{ 14, false },
{ 15, false },
{ 16, false },
{ 17, false },
{ 18, false },
{ 19, false },
{ 20, true },
{ 21, true },
{ 22, true },
{ 23, true },
{ 24, true },
{ 25, false },
{ 26, false },
{ 27, false },
{ 28, false },
{ 29, false },
{ 30, true },
{ 31, true },
{ 32, true },
{ 33, true },
{ 34, true },
{ 35, true },
{ 36, true },
{ 37, true },
{ 38, true },
{ 39, true },
{ 40, false },
{ 41, false },
{ 42, false },
{ 43, false },
{ 44, false },
{ 45, false },
{ 46, false },
{ 47, false },
{ 48, false },
{ 49, false },
{ 50, true },
{ 51, true },
{ 52, true },
{ 53, true },
{ 54, false },
{ 55, false },
{ 56, false },
{ 57, false },
{ 58, false },
{ 59, false },
{ 60, false },
{ 61, false },
{ 62, true },
{ 63, true },
{ 64, true },
{ 65, true },
{ 66, true },
{ 67, true },
{ 68, true },
{ 69, true },
{ 70, false },
{ 71, false },
{ 72, false },
{ 73, false },
{ 74, false },
{ 75, false },
{ 76, false },
{ 77, false },
{ 78, true },
{ 79, true },
{ 80, true },
{ 81, true },
{ 82, true },
{ 83, false },
{ 84, true },
{ 85, true },
{ 86, true },
{ 87, true },
{ 88, false },
{ 89, false },
{ 90, false },
{ 91, false },
{ 92, false },
{ 93, false },
{ 94, false },
{ 95, false },
{ 96, false },
{ 97, true },
{ 98, true },
{ 99, true },
{ 100, true },
{ 101, true },
{ 102, true },
{ 103, true },
{ 104, true },
{ 105, true },
{ 106, false },
{ 107, false },
{ 108, false },
{ 109, false },
{ 110, false },
{ 111, false },
{ 112, false },
{ 113, false },
{ 114, false },
{ 115, true },
{ 116, true },
{ 117, true },
{ 118, true },
{ 119, true },
{ 120, false },
{ 121, false },
{ 122, false },
{ 123, false },
{ 124, false },
{ 125, false },
{ 126, false },
{ 127, false },
{ 128, true },
{ 129, false },
{ 130, false },
{ 131, true },
{ 132, true },
{ 133, true },
{ 134, true },
{ 135, true },
{ 136, true },
{ 137, true },
{ 138, true },
{ 139, true },
{ 140, false },
{ 141, false },
{ 142, false },
{ 143, true },
{ 144, true },
{ 145, true }
};
};
}
Loading