Skip to content
Snippets Groups Projects
Commit 76407c5f authored by Christopher Rob Jones's avatar Christopher Rob Jones
Browse files

Merge branch 'rich-use-dd4hep-params-panel-sizes' into 'master' 

Rich use dd4hep params panel sizes

See merge request !3708
parents 270e1a33 618e52ce
No related branches found
No related tags found
1 merge request!3708Rich use dd4hep params panel sizes
Pipeline #4288521 passed
Stage: test
    Expand all Hide whitespace changes
    Inline Side-by-side
    Rich/RichDetectors/include/RichDetectors/RichPDPanel.h
    + 10
    − 14
    View file @ 76407c5f
    ......@@ -250,9 +250,7 @@ namespace Rich::Detector {
    using GP = Gaudi::XYZPoint;
    // panel shift in Z
    m_zShift = dd4hep_param<double>( Rich::Rich1 == m_rich //
    ? "Rich1PmtDetPlaneZInPmtPanel"
    : "Rich2PmtDetPlaneZInPmtPanel" );
    init_param( m_zShift, ( Rich::Rich1 == m_rich ? "Rich1PmtDetPlaneZInPmtPanel" : "Rich2PmtDetPlaneZInPmtPanel" ) );
    // Form the detection plane Plane3D object, from three points in its plane.
    {
    ......@@ -272,17 +270,15 @@ namespace Rich::Detector {
    ( m_rich == Rich::Rich2 && m_side == Rich::left )
    ? 1
    : -1 );
    // const auto panelSizes =
    // ( m_rich == Rich::Rich1 //
    // ? std::array{FP( 2 ) * fabs( dd4hep_param<double>( "Rh1PMTModulePlaneXEdgeTop" ) ), //
    // FP( 2 ) * fabs( dd4hep_param<double>( "Rh1PMTModulePlaneYEdgeTop" ) )} //
    // : std::array{FP( 2 ) * fabs( dd4hep_param<double>( "Rh2MixedPMTModulePlaneXEdgeLeft" ) ), //
    // FP( 2 ) * fabs( dd4hep_param<double>( "Rh2MixedPMTModulePlaneYEdgeLeft" ) )} );
    // for now hardcode parameters as per DetDesc
    const auto panelSizes = ( m_rich == Rich::Rich1 ? std::array{1344.0, 621.5} //
    : std::array{678.0, 1344.0} );
    const auto aOffset = fabs( FP( 0.5 ) * panelSizes[Rich::Rich1 == m_rich ? 1 : 0] );
    const auto detPlaneZ = m_zShift;
    const auto panelSizes =
    ( m_rich == Rich::Rich1 // DetDesc
    ? std::array{FP( 2 ) * fabs( dd4hep_param<double>( "Rh1PMTModulePlaneXEdgeTop" ) ), // 1344.0
    FP( 2 ) * fabs( dd4hep_param<double>( "Rh1PMTModulePlaneYEdgeTop" ) )} // 621.5
    : std::array{FP( 2 ) * fabs( dd4hep_param<double>( "Rh2MixedPMTModulePlaneXEdgeLeft" ) ), // 678.0
    FP( 2 ) * fabs( dd4hep_param<double>( "Rh2MixedPMTModulePlaneYEdgeLeft" ) )} // 1344.0
    );
    const auto aOffset = fabs( FP( 0.5 ) * panelSizes[Rich::Rich1 == m_rich ? 1 : 0] );
    const auto detPlaneZ = m_zShift;
    const auto localTranslation =
    ( m_rich == Rich::Rich1 ? ROOT::Math::Translation3D( aPon.x(), sign * aOffset, -detPlaneZ )
    : ROOT::Math::Translation3D( sign * aOffset, aPon.y(), -detPlaneZ ) );
    ......
    Rich/RichDetectors/tests/refs/instanciate-compat-old-rich1.ref.dd4hep
    + 10
    − 10
    View file @ 76407c5f
    ......@@ -2282,13 +2282,13 @@ TestDerivedDets DEBUG -> [ Num=37 RoC=81540 CoC=(-17233.3,528.774,89843.6)
    TestDerivedDets DEBUG -> [ Num=38 RoC=70736 CoC=(-14841.2,559.792,79299.7) CentrePnt=(-1837.95,764.255,9769.49) CentreNorm=(-0.183829,-0.0028905,0.982954) Refl={ NumBins=643 Min(X,Y)=(1.24313e-06,0.8) Median(X,Y)=(6.83719e-06,0) Max(X,Y)=(1.24313e-05,0) } ]
    TestDerivedDets DEBUG -> [ Num=39 RoC=84409 CoC=(-16948.8,520.06,92815.6) CentrePnt=(-1431.99,764.044,9845.41) CentreNorm=(-0.183829,-0.0028905,0.982954) Refl={ NumBins=643 Min(X,Y)=(1.24313e-06,0.8) Median(X,Y)=(6.83719e-06,0) Max(X,Y)=(1.24313e-05,0) } ]
    TestDerivedDets DEBUG 2 PD Panels :-
    TestDerivedDets DEBUG -> [ Rich2 ASide-left NumPDModules=92 ModNumOffset=138 ZShift=-36.2 CentrePtnInGlo=(3725.6,-0.875324,11051.3) (x,y)HalfSizes=+-(339,672) DetectionPlane=[ -0.874847 0.00139547 -0.484397 8612.54 ]
    TestDerivedDets DEBUG -> [ Rich2 ASide-left NumPDModules=92 ModNumOffset=138 ZShift=-36.2 CentrePtnInGlo=(3698.23,-1.02122,11100.7) (x,y)HalfSizes=+-(395.5,672) DetectionPlane=[ -0.874847 0.00139547 -0.484397 8612.54 ]
    TestDerivedDets DEBUG PDPanelToGlo=
    TestDerivedDets DEBUG [ 0.484399 -3e-05 0.874847 3725.6
    TestDerivedDets DEBUG 0.00258221 0.999996 -0.00139547 -0.875324
    TestDerivedDets DEBUG -0.874843 0.002935 0.484397 11051.3 ]
    TestDerivedDets DEBUG [ 0.484399 -3e-05 0.874847 3698.23
    TestDerivedDets DEBUG 0.00258221 0.999996 -0.00139547 -1.02122
    TestDerivedDets DEBUG -0.874843 0.002935 0.484397 11100.7 ]
    TestDerivedDets DEBUG GloToPDPanel=
    TestDerivedDets DEBUG [ 0.484399 0.00258221 -0.874843 7863.46
    TestDerivedDets DEBUG [ 0.484399 0.00258221 -0.874843 7919.96
    TestDerivedDets DEBUG -3e-05 0.999996 0.002935 -31.4484
    TestDerivedDets DEBUG 0.874847 -0.00139547 0.484397 -8612.54 ]
    TestDerivedDets DEBUG GloToLoc=
    ......@@ -2947,13 +2947,13 @@ TestDerivedDets DEBUG -> [ PD { PMT:h Rich2 L-A PD[Mod,NInMod]:209,00 Mod
    TestDerivedDets DEBUG -> [ PD { PMT:h Rich2 L-A PD[Mod,NInMod]:209,01 Mod[Col,NInCol]:12,05 PD[EC,NInEC]:1,0 } EffPixArea=36 EffNumPixs=64 NumPixColFrac=3.5 NumPixRowFrac=3.5 LocalZcoord=7 CenPtnInGlo=(4045.77,-520.932,10484.3) CenPtnInPanel=(310.75,-532,-30) (x,y,z)RotnInGlo=(3.13866,1.06512,0.00533069) (x,y)Acpt=+-(24.25,24.25) QE={ NumBins=368 Min(X,Y)=(1.61445e-06,0) Median(X,Y)=(4.26035e-06,37.1876) Max(X,Y)=(6.90625e-06,0) } ]
    TestDerivedDets DEBUG -> [ PD { PMT:h Rich2 L-A PD[Mod,NInMod]:209,02 Mod[Col,NInCol]:12,05 PD[EC,NInEC]:2,0 } EffPixArea=36 EffNumPixs=64 NumPixColFrac=3.5 NumPixRowFrac=3.5 LocalZcoord=7 CenPtnInGlo=(4045.78,-576.932,10484.2) CenPtnInPanel=(310.75,-588,-30) (x,y,z)RotnInGlo=(3.13866,1.06512,0.00533069) (x,y)Acpt=+-(24.25,24.25) QE={ NumBins=368 Min(X,Y)=(1.61445e-06,0) Median(X,Y)=(4.26035e-06,37.1876) Max(X,Y)=(6.90625e-06,0) } ]
    TestDerivedDets DEBUG -> [ PD { PMT:h Rich2 L-A PD[Mod,NInMod]:209,03 Mod[Col,NInCol]:12,05 PD[EC,NInEC]:3,0 } EffPixArea=36 EffNumPixs=64 NumPixColFrac=3.5 NumPixRowFrac=3.5 LocalZcoord=7 CenPtnInGlo=(4045.78,-632.932,10484) CenPtnInPanel=(310.75,-644,-30) (x,y,z)RotnInGlo=(3.13866,1.06512,0.00533069) (x,y)Acpt=+-(24.25,24.25) QE={ NumBins=368 Min(X,Y)=(1.61445e-06,0) Median(X,Y)=(4.26035e-06,37.1876) Max(X,Y)=(6.90625e-06,0) } ]
    TestDerivedDets DEBUG -> [ Rich2 CSide-right NumPDModules=92 ModNumOffset=222 ZShift=-36.2 CentrePtnInGlo=(-3726.94,-0.865358,11053.2) (x,y)HalfSizes=+-(339,672) DetectionPlane=[ 0.874731 0.00144857 -0.484607 8616.51 ]
    TestDerivedDets DEBUG -> [ Rich2 CSide-right NumPDModules=92 ModNumOffset=222 ZShift=-36.2 CentrePtnInGlo=(-3699.56,-1.00959,11102.6) (x,y)HalfSizes=+-(395.5,672) DetectionPlane=[ 0.874731 0.00144857 -0.484607 8616.51 ]
    TestDerivedDets DEBUG PDPanelToGlo=
    TestDerivedDets DEBUG [ 0.484609 -3e-05 -0.874731 -3726.94
    TestDerivedDets DEBUG -0.0025528 0.999996 -0.00144857 -0.865358
    TestDerivedDets DEBUG 0.874727 0.002935 0.484607 11053.2 ]
    TestDerivedDets DEBUG [ 0.484609 -3e-05 -0.874731 -3699.56
    TestDerivedDets DEBUG -0.0025528 0.999996 -0.00144857 -1.00959
    TestDerivedDets DEBUG 0.874727 0.002935 0.484607 11102.6 ]
    TestDerivedDets DEBUG GloToPDPanel=
    TestDerivedDets DEBUG [ 0.484609 -0.0025528 0.874727 -7862.39
    TestDerivedDets DEBUG [ 0.484609 -0.0025528 0.874727 -7918.89
    TestDerivedDets DEBUG -3e-05 0.999996 0.002935 -31.6875
    TestDerivedDets DEBUG -0.874731 -0.00144857 0.484607 -8616.51 ]
    TestDerivedDets DEBUG GloToLoc=
    Rich/RichDetectors/tests/refs/instanciate-compat-trunk.ref.dd4hep
    + 10
    − 10
    View file @ 76407c5f
    ......@@ -2246,13 +2246,13 @@ TestDerivedDets DEBUG -> [ Num=37 RoC=81540 CoC=(-17233.3,528.774,89843.6)
    TestDerivedDets DEBUG -> [ Num=38 RoC=70736 CoC=(-14841.2,559.792,79299.7) CentrePnt=(-1837.95,764.255,9769.49) CentreNorm=(-0.183829,-0.0028905,0.982954) Refl={ NumBins=643 Min(X,Y)=(1.24313e-06,0.8) Median(X,Y)=(6.83719e-06,0) Max(X,Y)=(1.24313e-05,0) } ]
    TestDerivedDets DEBUG -> [ Num=39 RoC=84409 CoC=(-16948.8,520.06,92815.6) CentrePnt=(-1431.99,764.044,9845.41) CentreNorm=(-0.183829,-0.0028905,0.982954) Refl={ NumBins=643 Min(X,Y)=(1.24313e-06,0.8) Median(X,Y)=(6.83719e-06,0) Max(X,Y)=(1.24313e-05,0) } ]
    TestDerivedDets DEBUG 2 PD Panels :-
    TestDerivedDets DEBUG -> [ Rich2 ASide-left NumPDModules=92 ModNumOffset=138 ZShift=-36.2 CentrePtnInGlo=(3725.6,-0.875324,11051.3) (x,y)HalfSizes=+-(339,672) DetectionPlane=[ -0.874847 0.00139547 -0.484397 8612.54 ]
    TestDerivedDets DEBUG -> [ Rich2 ASide-left NumPDModules=92 ModNumOffset=138 ZShift=-36.2 CentrePtnInGlo=(3698.23,-1.02122,11100.7) (x,y)HalfSizes=+-(395.5,672) DetectionPlane=[ -0.874847 0.00139547 -0.484397 8612.54 ]
    TestDerivedDets DEBUG PDPanelToGlo=
    TestDerivedDets DEBUG [ 0.484399 -3e-05 0.874847 3725.6
    TestDerivedDets DEBUG 0.00258221 0.999996 -0.00139547 -0.875324
    TestDerivedDets DEBUG -0.874843 0.002935 0.484397 11051.3 ]
    TestDerivedDets DEBUG [ 0.484399 -3e-05 0.874847 3698.23
    TestDerivedDets DEBUG 0.00258221 0.999996 -0.00139547 -1.02122
    TestDerivedDets DEBUG -0.874843 0.002935 0.484397 11100.7 ]
    TestDerivedDets DEBUG GloToPDPanel=
    TestDerivedDets DEBUG [ 0.484399 0.00258221 -0.874843 7863.46
    TestDerivedDets DEBUG [ 0.484399 0.00258221 -0.874843 7919.96
    TestDerivedDets DEBUG -3e-05 0.999996 0.002935 -31.4484
    TestDerivedDets DEBUG 0.874847 -0.00139547 0.484397 -8612.54 ]
    TestDerivedDets DEBUG GloToLoc=
    ......@@ -2911,13 +2911,13 @@ TestDerivedDets DEBUG -> [ PD { PMT:h Rich2 L-A PD[Mod,NInMod]:209,00 Mod
    TestDerivedDets DEBUG -> [ PD { PMT:h Rich2 L-A PD[Mod,NInMod]:209,01 Mod[Col,NInCol]:12,05 PD[EC,NInEC]:1,0 } EffPixArea=36 EffNumPixs=64 NumPixColFrac=3.5 NumPixRowFrac=3.5 LocalZcoord=7 CenPtnInGlo=(4045.77,-520.932,10484.3) CenPtnInPanel=(310.75,-532,-30) (x,y,z)RotnInGlo=(3.13866,1.06512,0.00533069) (x,y)Acpt=+-(24.25,24.25) QE={ NumBins=368 Min(X,Y)=(1.61445e-06,0) Median(X,Y)=(4.26035e-06,37.1876) Max(X,Y)=(6.90625e-06,0) } ]
    TestDerivedDets DEBUG -> [ PD { PMT:h Rich2 L-A PD[Mod,NInMod]:209,02 Mod[Col,NInCol]:12,05 PD[EC,NInEC]:2,0 } EffPixArea=36 EffNumPixs=64 NumPixColFrac=3.5 NumPixRowFrac=3.5 LocalZcoord=7 CenPtnInGlo=(4045.78,-576.932,10484.2) CenPtnInPanel=(310.75,-588,-30) (x,y,z)RotnInGlo=(3.13866,1.06512,0.00533069) (x,y)Acpt=+-(24.25,24.25) QE={ NumBins=368 Min(X,Y)=(1.61445e-06,0) Median(X,Y)=(4.26035e-06,37.1876) Max(X,Y)=(6.90625e-06,0) } ]
    TestDerivedDets DEBUG -> [ PD { PMT:h Rich2 L-A PD[Mod,NInMod]:209,03 Mod[Col,NInCol]:12,05 PD[EC,NInEC]:3,0 } EffPixArea=36 EffNumPixs=64 NumPixColFrac=3.5 NumPixRowFrac=3.5 LocalZcoord=7 CenPtnInGlo=(4045.78,-632.932,10484) CenPtnInPanel=(310.75,-644,-30) (x,y,z)RotnInGlo=(3.13866,1.06512,0.00533069) (x,y)Acpt=+-(24.25,24.25) QE={ NumBins=368 Min(X,Y)=(1.61445e-06,0) Median(X,Y)=(4.26035e-06,37.1876) Max(X,Y)=(6.90625e-06,0) } ]
    TestDerivedDets DEBUG -> [ Rich2 CSide-right NumPDModules=92 ModNumOffset=222 ZShift=-36.2 CentrePtnInGlo=(-3726.94,-0.865358,11053.2) (x,y)HalfSizes=+-(339,672) DetectionPlane=[ 0.874731 0.00144857 -0.484607 8616.51 ]
    TestDerivedDets DEBUG -> [ Rich2 CSide-right NumPDModules=92 ModNumOffset=222 ZShift=-36.2 CentrePtnInGlo=(-3699.56,-1.00959,11102.6) (x,y)HalfSizes=+-(395.5,672) DetectionPlane=[ 0.874731 0.00144857 -0.484607 8616.51 ]
    TestDerivedDets DEBUG PDPanelToGlo=
    TestDerivedDets DEBUG [ 0.484609 -3e-05 -0.874731 -3726.94
    TestDerivedDets DEBUG -0.0025528 0.999996 -0.00144857 -0.865358
    TestDerivedDets DEBUG 0.874727 0.002935 0.484607 11053.2 ]
    TestDerivedDets DEBUG [ 0.484609 -3e-05 -0.874731 -3699.56
    TestDerivedDets DEBUG -0.0025528 0.999996 -0.00144857 -1.00959
    TestDerivedDets DEBUG 0.874727 0.002935 0.484607 11102.6 ]
    TestDerivedDets DEBUG GloToPDPanel=
    TestDerivedDets DEBUG [ 0.484609 -0.0025528 0.874727 -7862.39
    TestDerivedDets DEBUG [ 0.484609 -0.0025528 0.874727 -7918.89
    TestDerivedDets DEBUG -3e-05 0.999996 0.002935 -31.6875
    TestDerivedDets DEBUG -0.874731 -0.00144857 0.484607 -8616.51 ]
    TestDerivedDets DEBUG GloToLoc=
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment