Skip to content

Commit

Permalink
Fix a few compiler warnings (#374)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcarcell authored Aug 9, 2024
1 parent 9895fd5 commit bfe1899
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
9 changes: 3 additions & 6 deletions detector/calorimeter/ECalEndcap_Turbine_o1_v01_geo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ namespace det {
float LArgapi = nobleLiquidElem.attr<float>(_Unicode(gap));

bool sameNUnitCells = genericBladeElem.attr<bool>(_Unicode(sameNUnitCells));
char* nUnitCellsStrArr = (char*)genericBladeElem.attr<std::string>(_Unicode(nUnitCells)).c_str();
char* nUnitCellsCStr = strtok(nUnitCellsStrArr, " ");
int nUnitCells;
auto nUnitCellsStrArr = genericBladeElem.attr<std::string>(_Unicode(nUnitCells));
char* nUnitCellsCStr = strtok(const_cast<char*>(nUnitCellsStrArr.c_str()), " ");
int nUnitCells = 0;
if (!sameNUnitCells) {
for (unsigned i = 0; i < iWheel; i++) {
nUnitCellsCStr = strtok(NULL, " ");
Expand Down Expand Up @@ -162,7 +162,6 @@ namespace det {
float LArgapo = delrPhiGapOnly*TMath::Sin(BladeAngle);
// LArgapo *= 2.;

dd4hep::Solid absBlade;
float riLayer = ri;

std::vector<dd4hep::Volume> claddingLayerVols;
Expand Down Expand Up @@ -578,7 +577,6 @@ namespace det {
double ri = rmin;

float supportTubeThickness=supportTubeElem.thickness();
unsigned iSupportTube = 0;

for (unsigned iWheel = 0; iWheel < nWheels; iWheel++) {

Expand All @@ -600,7 +598,6 @@ namespace det {
ri = ro;
ro *= radiusRatio;
if (ro > rmax) ro = rmax;
iSupportTube++;
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ class GridDRcalo_k4geo : public Segmentation {
virtual ~GridDRcalo_k4geo() override;

// Determine the global(local) position based on the cell ID.
virtual Vector3D position(const CellID& aCellID) const;
virtual Vector3D position(const CellID& aCellID) const override;
Vector3D localPosition(const CellID& aCellID) const;
Vector3D localPosition(int numx, int numy, int x_, int y_) const;

virtual CellID cellID(const Vector3D& aLocalPosition, const Vector3D& aGlobalPosition,
const VolumeID& aVolumeID) const;
const VolumeID& aVolumeID) const override;

VolumeID setVolumeID(int numEta, int numPhi) const;
CellID setCellID(int numEta, int numPhi, int x, int y) const;
Expand Down
6 changes: 5 additions & 1 deletion plugins/DRCaloFastSimModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ struct FastFiberData
{
public:
FastFiberData(G4int, G4double, G4double, G4double, G4ThreeVector, G4ThreeVector, G4ThreeVector, G4int status = G4OpBoundaryProcessStatus::Undefined);
~FastFiberData() {}
FastFiberData& operator=(const FastFiberData& theData) = default;

FastFiberData(const FastFiberData& theData) = default;
~FastFiberData() = default;


void reset();

Expand Down

0 comments on commit bfe1899

Please sign in to comment.