Skip to content

Commit

Permalink
Add option to scale marker size and line thickness of helices
Browse files Browse the repository at this point in the history
  • Loading branch information
Marko Petric committed Nov 6, 2018
1 parent da8315a commit b5d2d5a
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 12 deletions.
4 changes: 4 additions & 0 deletions ced2go/ced2go-template-DD4.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
<parameter name="ColorByEnergyBrightness" type="double">1.0</parameter>
<!-- Automatically adjust event by event the blue to min energy and red to max energy of event -->
<parameter name="ColorByEnergyAutoColor" type="bool">false</parameter>
<!-- Scale line thickness of drawn helixes, usefull for image dumps -->
<parameter name="ScaleLineThickness" type="double">1</parameter>
<!-- Scale marker size of cluster markers, usefull for image dumps -->
<parameter name="ScaleMarkerSize" type="double">1</parameter>
<!--Max R (mm) Extent for drawing Helix if UseTPCForLimitsOfHelix false-->
<parameter name="HelixMaxR" type="float">2000 </parameter>
<!--Max Z (mm) Extent for drawing Helix if UseTPCForLimitsOfHelix false-->
Expand Down
2 changes: 2 additions & 0 deletions include/DDCEDViewer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ class DDCEDViewer : public Processor {
double _colorEnergySaturation = 0.8 ;
double _colorEnergyValue = 0.8 ;
bool _colorEnergyAuto = false ;
double _scaleLineThickness = 1 ;
double _scaleMarkerSize = 1 ;
float _mcpECut = 0.001 ;
float _helix_max_r = 2000 ;
float _helix_max_z = 2500 ;
Expand Down
33 changes: 21 additions & 12 deletions src/DDCEDViewer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,15 @@ DDCEDViewer::DDCEDViewer() : Processor("DDCEDViewer") {
_colorEnergyAuto,
bool(false) ) ;

registerProcessorParameter( "ScaleLineThickness" ,
"Scale the line thickness of drawn helixes",
_scaleLineThickness,
double(1.0) ) ;

registerProcessorParameter( "ScaleMarkerSize" ,
"Scale the size of the markes",
_scaleMarkerSize,
double(1.0) ) ;

registerProcessorParameter( "MCParticleEnergyCut" ,
"minimum energy of MCParticles to be drawn",
Expand Down Expand Up @@ -522,12 +531,12 @@ void DDCEDViewer::drawCluster(dd4hep::Detector& /*theDetector*/, int& layer, uns
ced_hit_ID( (*it)->getPosition()[0],
(*it)->getPosition()[1],
(*it)->getPosition()[2],
marker, layer, size , color, clu->id() ) ;
marker, layer, size*_scaleMarkerSize , color, clu->id() ) ;
}
float x = clu->getPosition()[0] ;
float y = clu->getPosition()[1] ;
float z = clu->getPosition()[2] ;
ced_hit_ID( x,y,z, marker, layer , size*3 , color, clu->id() ) ;
ced_hit_ID( x,y,z, marker, layer , size*3*_scaleMarkerSize , color, clu->id() ) ;
LCVector3D v(x,y,z) ;
LCVector3D d(1.,1.,1.) ;
float length = 100 + 500 * ( clu->getEnergy() - emin ) / ( emax - emin ) ;
Expand Down Expand Up @@ -567,7 +576,7 @@ void DDCEDViewer::drawTrack(dd4hep::Detector& theDetector, int& layer, unsigned&
ced_hit_ID( (*it)->getPosition()[0],
(*it)->getPosition()[1],
(*it)->getPosition()[2],
marker, layer , size , color , trk->id() ) ;
marker, layer , size*_scaleMarkerSize , color , trk->id() ) ;
} // hits
const TrackState* ts = 0 ;
switch( _drawHelixForTracks ){
Expand All @@ -591,7 +600,7 @@ void DDCEDViewer::drawTrack(dd4hep::Detector& theDetector, int& layer, unsigned&
ced_hit_ID( ts->getReferencePoint()[0],
ts->getReferencePoint()[1],
ts->getReferencePoint()[2],
1 , layer , size*10 , color , trk->id() ) ;
1 , layer , size*10*_scaleMarkerSize , color , trk->id() ) ;
break ;
}
if( ts !=0 ){
Expand Down Expand Up @@ -626,7 +635,7 @@ void DDCEDViewer::drawTrack(dd4hep::Detector& theDetector, int& layer, unsigned&
const int ml = marker | ( layer << CED_LAYER_SHIFT ) ;
int helixColor = ( _useColorForHelixTracks ? color : 0xdddddd ) ;
DDMarlinCED::drawHelix( bField , charge, xs, ys, zs ,
px, py, pz, ml , 2 , helixColor ,
px, py, pz, ml , 2*_scaleLineThickness , helixColor ,
0.0, _helix_max_r,
_helix_max_z, trk->id() ) ;
}
Expand Down Expand Up @@ -683,7 +692,7 @@ void DDCEDViewer::drawMCParticle(dd4hep::Detector& theDetector, int& layer, unsi
_hmz = _helix_max_z;
}
DDMarlinCED::drawHelix( bField , charge, x, y, z,
px, py, pz, ml , size , 0x7af774 ,
px, py, pz, ml , size*_scaleLineThickness , 0x7af774 ,
0.0, _hmr ,
_hmz, mcp->id() ) ;
} else { // neutral
Expand Down Expand Up @@ -732,7 +741,7 @@ void DDCEDViewer::drawSIMTrackerHit(int& layer, unsigned& np, std::string colNam
ced_hit_ID( h->getPosition()[0],
h->getPosition()[1],
h->getPosition()[2],
marker,layer, size , color, id ) ;
marker,layer, size*_scaleMarkerSize , color, id ) ;

}
}
Expand All @@ -756,7 +765,7 @@ void DDCEDViewer::drawSIMCalorimeterHit(int& layer, unsigned& np, std::string co
ced_hit_ID( h->getPosition()[0],
h->getPosition()[1],
h->getPosition()[2],
marker,layer, size , color, id ) ;
marker,layer, size*_scaleMarkerSize , color, id ) ;

}
}
Expand All @@ -778,7 +787,7 @@ void DDCEDViewer::drawTrackerHit(int& layer, unsigned& np, std::string colName,
for( unsigned i=0,N=hits.size() ; i<N ; ++i){
TrackerHitPlane* h = hits[i] ;
TVector3 p(h->getPosition()[0] , h->getPosition()[1] , h->getPosition()[2]);
ced_hit_ID( p.X(), p.Y(), p.Z(), marker, layer , size , color, h->id() );
ced_hit_ID( p.X(), p.Y(), p.Z(), marker, layer , size*_scaleMarkerSize , color, h->id() );
// draw an additional line for strip hits
if( BitSet32( h->getType() )[ ILDTrkHitTypeBit::ONE_DIMENSIONAL ] ) {
double strip_half_length = 50. ; //FIXME: need to get the proper strip length (from the surface !?)
Expand Down Expand Up @@ -877,7 +886,7 @@ void DDCEDViewer::drawReconstructedParticle(dd4hep::Detector& theDetector, int&
float x = hit->getPosition()[0];
float y = hit->getPosition()[1];
float z = hit->getPosition()[2];
ced_hit_ID(x,y,z,marker, layer ,size,color,part->id());
ced_hit_ID(x,y,z,marker, layer ,size*_scaleMarkerSize,color,part->id());
}
}

Expand Down Expand Up @@ -994,7 +1003,7 @@ void DDCEDViewer::drawReconstructedParticle(dd4hep::Detector& theDetector, int&
float x = (float)hit->getPosition()[0];
float y = (float)hit->getPosition()[1];
float z = (float)hit->getPosition()[2];
ced_hit_ID(x,y,z,marker, layer,size,color,part->id());
ced_hit_ID(x,y,z,marker, layer,size*_scaleMarkerSize,color,part->id());
}
}
if((nHits==0 || _drawHelixForPFOs==1) && std::fabs(part->getCharge())>0.001){
Expand Down Expand Up @@ -1022,7 +1031,7 @@ void DDCEDViewer::drawReconstructedParticle(dd4hep::Detector& theDetector, int&
double Zs = ts->getReferencePoint()[2] + ts->getZ0() ;
int helixColor = ( _useColorForHelixTracks ? color : 0xdddddd ) ;
//helix
DDMarlinCED::drawHelix(bField, charge, Xs, Ys, Zs, Px, Py, Pz, marker|(layer<<CED_LAYER_SHIFT), size/2,
DDMarlinCED::drawHelix(bField, charge, Xs, Ys, Zs, Px, Py, Pz, marker|(layer<<CED_LAYER_SHIFT), size/2*_scaleLineThickness,
helixColor, 0.0, _helix_max_r, _helix_max_z, part->id() ); //hauke: add id
}
}
Expand Down

0 comments on commit b5d2d5a

Please sign in to comment.