Skip to content

Remove redundant dynamic_casts. #21

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

Open
scott-snyder wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove redundant dynamic_casts. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions include/DDKalTest/DDConeMeasLayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ class DDConeMeasLayer : public DDVMeasLayer, private DDConeMeasLayer_Base::Data,


private:
DDConeMeasLayer(dd4hep::rec::ISurface* surf,
dd4hep::rec::ICone& icone,
Double_t Bz,
const Char_t *name = "DDConeMeasL") ;

Double_t fsortingPolicy; // used for sorting the layers in to out
};
Expand Down
5 changes: 4 additions & 1 deletion include/DDKalTest/DDCylinderMeasLayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ class DDCylinderMeasLayer : public DDVMeasLayer, public TCylinder {
unsigned fMDim ;

private:

DDCylinderMeasLayer(dd4hep::rec::ISurface* surf,
dd4hep::rec::ICylinder& icyl,
Double_t Bz,
const Char_t *name = "DDCylinderMeasL") ;
};
#endif
19 changes: 15 additions & 4 deletions src/DDConeMeasLayer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,22 @@
DDConeMeasLayer::DDConeMeasLayer(dd4hep::rec::ISurface* surf,
Double_t Bz,
const Char_t *name ) :
DDConeMeasLayer (surf,
dynamic_cast<dd4hep::rec::ICone&>(*surf),
Bz,
name)
{
}

DDConeMeasLayer::DDConeMeasLayer(dd4hep::rec::ISurface* surf,
dd4hep::rec::ICone& icone,
Double_t Bz,
const Char_t *name ) :
DDVMeasLayer( surf, Bz, name ) ,
Data(dynamic_cast<dd4hep::rec::ICone*>(surf)->z0()/dd4hep::mm ,
dynamic_cast<dd4hep::rec::ICone*>(surf)->radius0()/dd4hep::mm,
dynamic_cast<dd4hep::rec::ICone*>(surf)->z1()/dd4hep::mm,
dynamic_cast<dd4hep::rec::ICone*>(surf)->radius1()/dd4hep::mm ),
Data(icone.z0()/dd4hep::mm ,
icone.radius0()/dd4hep::mm,
icone.z1()/dd4hep::mm,
icone.radius1()/dd4hep::mm ),
TCutCone(_R1*(_Z2-_Z1)/(_R2-_R1),
_R2*(_Z2-_Z1)/(_R2-_R1),
(_R2-_R1)/(_Z2-_Z1),
Expand Down
20 changes: 16 additions & 4 deletions src/DDCylinderMeasLayer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,25 @@ using namespace UTIL ;
DDCylinderMeasLayer::DDCylinderMeasLayer(dd4hep::rec::ISurface* surf,
Double_t Bz,
const Char_t *name ) :
DDCylinderMeasLayer (surf,
dynamic_cast<dd4hep::rec::ICylinder&>(*surf),
Bz,
name)
{
}


DDCylinderMeasLayer::DDCylinderMeasLayer(dd4hep::rec::ISurface* surf,
dd4hep::rec::ICylinder& icyl,
Double_t Bz,
const Char_t *name ) :
DDVMeasLayer( surf, Bz, name ) ,

TCylinder( dynamic_cast<dd4hep::rec::ICylinder*>(surf)->radius()/dd4hep::mm ,
TCylinder( icyl.radius()/dd4hep::mm ,
surf->length_along_v()/dd4hep::mm / 2. ,
dynamic_cast<dd4hep::rec::ICylinder*>(surf)->center().x()/dd4hep::mm,
dynamic_cast<dd4hep::rec::ICylinder*>(surf)->center().y()/dd4hep::mm ,
dynamic_cast<dd4hep::rec::ICylinder*>(surf)->center().z()/dd4hep::mm ),
icyl.center().x()/dd4hep::mm,
icyl.center().y()/dd4hep::mm ,
icyl.center().z()/dd4hep::mm ),

fSortingPolicy(0.),

Expand Down