-
Notifications
You must be signed in to change notification settings - Fork 95
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.
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
adding a layered calorimeter struct that copes with conical calorimeters #132
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As far as I see this is identical to the not conical with the difference that double extent[6] ;
instead of double extent[4] ;
. Wouldn't it then be better to modify LayeredCalorimeterStruct
and put an if in the overloading checking if the two last fields are filled?
DDRec/include/DDRec/DetectorData.h
Outdated
|
||
|
||
/** Azimuthal angle of the first module in barrel layout | ||
* DEPRECATED! PLEASE POPULATE INNER/OUTER PHI0 INSTEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are you even putting it in if it is deprecated?
DDRec/src/DetectorData.cpp
Outdated
io << " Layers : " << std::endl | ||
<< " distance inner_nX0 outer_nX0 inner_nInt outer_nInt inner_thick outer_thick sense_thick" | ||
<< std::endl ; | ||
//"distance inner_nX0 outer_nX0 inner_nLambda outer_nLambda inner_thick outer_thick sensitive_thick" << std::endl ; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the purpose of this comment?
DDRec/src/DetectorData.cpp
Outdated
@@ -195,6 +239,6 @@ namespace DD4hep { | |||
return io ; | |||
} | |||
|
|||
|
|||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
White space change, please remove.
DDRec/include/DDRec/DetectorData.h
Outdated
* | ||
* @author Y.Voutsinas, CERN | ||
* @date March, 2017 | ||
* @version $Id: $ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$Is is a SVN tag
Could we not simply have: /// enum for encoding the sensor type in typeFlags
enum LayoutType{
BarrelLayout=0,
EndcapLayout,
ConicalLayout
};
/// type of layout: BarrelLayout, EndcapLayout or ConicalLayout
LayoutType layoutType ;
/** extent of the calorimeter in the r-z-plane [ rmin, rmax, zmin, zmax, rmin2, rmax2 ] in mm.
* where rmin2, rmax2 are the radii at zmax for the ConicalLayout and not used else.
*/
double extent[6] ;
|
I agree, and then you can use |
…onicalLayouts as well
Thanks for your suggestions, I modified accordingly. |
@Voutsi please modify(edit comment) in the initial comment in the release notes tag to reflect the actual change. |
release notes updated |
BEGINRELEASENOTES
ENDRELEASENOTES