Skip to content

style: clang-format DD4hep integration files for dd4hep_integration merge #277

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
plexoos merged 2 commits into from
Apr 7, 2026
Merged

style: clang-format DD4hep integration files for dd4hep_integration merge #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c11240
Initial plan
Copilot Apr 7, 2026
62a7847
style: apply clang-format to DD4hep integration files
Copilot Apr 7, 2026
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
62 changes: 35 additions & 27 deletions dd4hepplugins/DD4hepSensorIdentifier.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@ explicitly set via DetElement::setSensitiveDetector().

struct DD4hepSensorIdentifier : public U4SensorIdentifier
{
int level = 0 ;
int counter = 0 ; // auto-increment sensor ID (1-based; 0 means "not a sensor" in opticks)
int level = 0;
int counter = 0; // auto-increment sensor ID (1-based; 0 means "not a sensor" in opticks)

void setLevel(int _level) override { level = _level ; }
void setLevel( int _level ) override
{
level = _level;
}

/**
getGlobalIdentity
Expand All @@ -37,26 +40,28 @@ struct DD4hepSensorIdentifier : public U4SensorIdentifier
Note: opticks treats sensor_id == 0 as "not a sensor", so IDs must be >= 1.
PV copy numbers are not reliable (e.g. dRICH SiPMs all have copyNo=0).
**/
int getGlobalIdentity(const G4VPhysicalVolume* pv,
const G4VPhysicalVolume* /*ppv*/) override
int getGlobalIdentity( const G4VPhysicalVolume* pv,
const G4VPhysicalVolume* /*ppv*/ ) override
{
if (!pv) return -1 ;
if( !pv )
return -1;

const G4LogicalVolume* lv = pv->GetLogicalVolume() ;
G4VSensitiveDetector* sd = lv->GetSensitiveDetector() ;
const G4LogicalVolume* lv = pv->GetLogicalVolume();
G4VSensitiveDetector* sd = lv->GetSensitiveDetector();

if (!sd) return -1 ;
if( !sd )
return -1;

int sensor_id = ++counter ; // 1-based unique ID
int sensor_id = ++counter; // 1-based unique ID

if (level > 0)
if( level > 0 )
std::cout << "DD4hepSensorIdentifier::getGlobalIdentity"
<< " sensor_id " << sensor_id
<< " sd " << sd->GetName()
<< " pv " << pv->GetName()
<< std::endl ;
<< std::endl;

return sensor_id ;
return sensor_id;
}

/**
Expand All @@ -65,27 +70,30 @@ struct DD4hepSensorIdentifier : public U4SensorIdentifier
Same as default: recursively search for G4VSensitiveDetector
within the instance subtree.
**/
int getInstanceIdentity(const G4VPhysicalVolume* instance_outer_pv) const override
int getInstanceIdentity( const G4VPhysicalVolume* instance_outer_pv ) const override
{
if (!instance_outer_pv) return -1 ;
if( !instance_outer_pv )
return -1;

std::vector<const G4VPhysicalVolume*> sdpv ;
FindSD_r(sdpv, instance_outer_pv, 0) ;
std::vector<const G4VPhysicalVolume*> sdpv;
FindSD_r( sdpv, instance_outer_pv, 0 );

if (sdpv.empty()) return -1 ;
if( sdpv.empty() )
return -1;

const G4PVPlacement* pvp =
dynamic_cast<const G4PVPlacement*>(instance_outer_pv) ;
return pvp ? pvp->GetCopyNo() : 0 ;
dynamic_cast<const G4PVPlacement*>( instance_outer_pv );
return pvp ? pvp->GetCopyNo() : 0;
}

static void FindSD_r(std::vector<const G4VPhysicalVolume*>& sdpv,
const G4VPhysicalVolume* pv, int depth)
static void FindSD_r( std::vector<const G4VPhysicalVolume*>& sdpv,
const G4VPhysicalVolume* pv, int depth )
{
const G4LogicalVolume* lv = pv->GetLogicalVolume() ;
G4VSensitiveDetector* sd = lv->GetSensitiveDetector() ;
if (sd) sdpv.push_back(pv) ;
for (size_t i = 0; i < size_t(lv->GetNoDaughters()); i++)
FindSD_r(sdpv, lv->GetDaughter(i), depth + 1) ;
const G4LogicalVolume* lv = pv->GetLogicalVolume();
G4VSensitiveDetector* sd = lv->GetSensitiveDetector();
if( sd )
sdpv.push_back( pv );
for( size_t i = 0; i < size_t( lv->GetNoDaughters() ); i++ )
FindSD_r( sdpv, lv->GetDaughter( i ), depth + 1 );
}
};
Loading
Loading