Skip to content

Commit

Permalink
geobase: Use override Around
Browse files Browse the repository at this point in the history 
As with parbase, now switch geobase over to use override
everywhere.

See-Also: f8225d1
  • Loading branch information
@ChristianTackeGSI @dennisklein
ChristianTackeGSI authored and dennisklein committed Nov 11, 2022
1 parent c58d383 commit 224598b
Show file tree
Hide file tree
Showing 18 changed files with 105 additions and 105 deletions.
26 changes: 13 additions & 13 deletions geobase/FairGeoAsciiIo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,24 @@ class FairGeoAsciiIo : public FairGeoIo
void setDirectory(const char* fDir) { filedir = fDir; }
const char* getDirectory() { return filedir.Data(); }
const char* getFilename() { return filename.Data(); }
Bool_t open(const char*, const Text_t* status = "in");
Bool_t isOpen();
Bool_t isWritable();
void close();
void print();
Bool_t read(FairGeoMedia*);
Bool_t read(FairGeoSet*, FairGeoMedia*);
Bool_t write(FairGeoMedia*);
Bool_t write(FairGeoSet* set);
Bool_t readGeomConfig(FairGeoInterface*);
Bool_t open(const char*, const Text_t* status = "in") override;
Bool_t isOpen() override;
Bool_t isWritable() override;
void close() override;
void print() override;
Bool_t read(FairGeoMedia*) override;
Bool_t read(FairGeoSet*, FairGeoMedia*) override;
Bool_t write(FairGeoMedia*) override;
Bool_t write(FairGeoSet* set) override;
Bool_t readGeomConfig(FairGeoInterface*) override;
Bool_t readDetectorSetup(FairGeoInterface*);
Bool_t setSimulRefRun(const char*) { return kTRUE; }
Bool_t setHistoryDate(const char*) { return kTRUE; }
Bool_t setSimulRefRun(const char*) override { return kTRUE; }
Bool_t setHistoryDate(const char*) override { return kTRUE; }

private:
FairGeoAsciiIo(const FairGeoAsciiIo&);
FairGeoAsciiIo& operator=(const FairGeoAsciiIo&);
ClassDef(FairGeoAsciiIo, 0); // Class for geometry I/O from ASCII file
ClassDefOverride(FairGeoAsciiIo, 0); // Class for geometry I/O from ASCII file
};

#endif /* !FAIRGEOASCIIIO_H */
12 changes: 6 additions & 6 deletions geobase/FairGeoAssembly.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ class FairGeoAssembly : public FairGeoBasicShape
public:
FairGeoAssembly();
~FairGeoAssembly();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
Int_t readPoints(std::fstream* pFile, FairGeoVolume* volu);
Bool_t writePoints(std::fstream*, FairGeoVolume*);
void printPoints(FairGeoVolume* volu);
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
Int_t readPoints(std::fstream* pFile, FairGeoVolume* volu) override;
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
void printPoints(FairGeoVolume* volu) override;

ClassDef(FairGeoAssembly, 0); // class for geometry shape ASSEMBLY
ClassDefOverride(FairGeoAssembly, 0); // class for geometry shape ASSEMBLY
};

#endif /* !FAIRGEOASSEMBLY_H */
6 changes: 3 additions & 3 deletions geobase/FairGeoBrik.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class FairGeoBrik : public FairGeoBasicShape
public:
FairGeoBrik();
~FairGeoBrik();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
ClassDef(FairGeoBrik, 0); // class for geometry shape BOX or BRIK
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
ClassDefOverride(FairGeoBrik, 0); // class for geometry shape BOX or BRIK
};

#endif /* !FAIRGEOBRIK_H */
6 changes: 3 additions & 3 deletions geobase/FairGeoCompositeVolume.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ class FairGeoCompositeVolume : public FairGeoVolume
FairGeoVolume* getComponent(const Int_t);
void createComponents(const Int_t);
void setComponent(FairGeoVolume*, const Int_t);
void clear();
void print();
ClassDef(FairGeoCompositeVolume, 1);
void clear() override;
void print() override;
ClassDefOverride(FairGeoCompositeVolume, 1);

private:
FairGeoCompositeVolume(const FairGeoCompositeVolume&);
Expand Down
12 changes: 6 additions & 6 deletions geobase/FairGeoCone.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ class FairGeoCone : public FairGeoBasicShape
public:
FairGeoCone();
~FairGeoCone();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
Int_t readPoints(std::fstream*, FairGeoVolume*);
Bool_t writePoints(std::fstream*, FairGeoVolume*);
void printPoints(FairGeoVolume* volu);
ClassDef(FairGeoCone, 0);
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
void printPoints(FairGeoVolume* volu) override;
ClassDefOverride(FairGeoCone, 0);
};

#endif /* !FAIRGEOCONE_H */
12 changes: 6 additions & 6 deletions geobase/FairGeoCons.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ class FairGeoCons : public FairGeoBasicShape
public:
FairGeoCons();
~FairGeoCons();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
Int_t readPoints(std::fstream*, FairGeoVolume*);
Bool_t writePoints(std::fstream*, FairGeoVolume*);
void printPoints(FairGeoVolume* volu);
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
void printPoints(FairGeoVolume* volu) override;

ClassDef(FairGeoCons, 0);
ClassDefOverride(FairGeoCons, 0);
};

#endif /* !FAIRGEOCONS_H */
12 changes: 6 additions & 6 deletions geobase/FairGeoEltu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ class FairGeoEltu : public FairGeoBasicShape
public:
FairGeoEltu();
~FairGeoEltu();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
Int_t readPoints(std::fstream*, FairGeoVolume*);
Bool_t writePoints(std::fstream*, FairGeoVolume*);
void printPoints(FairGeoVolume* volu);
ClassDef(FairGeoEltu, 0);
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
void printPoints(FairGeoVolume* volu) override;
ClassDefOverride(FairGeoEltu, 0);
};

#endif /* !FAIRGEOELTU_H */
6 changes: 3 additions & 3 deletions geobase/FairGeoNode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ class FairGeoNode : public FairGeoVolume
void setLabTransform(FairGeoTransform&);
Bool_t calcModuleTransform(FairGeoTransform&);
Bool_t calcRefPos(FairGeoVector&);
void clear();
void print();
void clear() override;
void print() override;
Bool_t write(std::fstream&);
Int_t compare(FairGeoNode&);

Expand All @@ -112,7 +112,7 @@ class FairGeoNode : public FairGeoVolume
}
}

ClassDef(FairGeoNode, 1); //
ClassDefOverride(FairGeoNode, 1); //
};

// -------------------- inlines --------------------------
Expand Down
26 changes: 13 additions & 13 deletions geobase/FairGeoOldAsciiIo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,26 @@ class FairGeoOldAsciiIo : public FairGeoIo
void setDirectory(const char* fDir) { filedir = fDir; }
const char* getDirectory() { return filedir.Data(); }
const char* getFilename() { return filename.Data(); }
Bool_t open(const char*, const Text_t* status = "in");
Bool_t isOpen();
Bool_t isWritable();
void close();
void print();
Bool_t read(FairGeoMedia*) { return kFALSE; }
Bool_t read(FairGeoSet*, FairGeoMedia*);
Bool_t write(FairGeoMedia*) { return kFALSE; }
Bool_t write(FairGeoSet*) { return kFALSE; }
Bool_t readGeomConfig(FairGeoInterface*) { return kFALSE; }
Bool_t open(const char*, const Text_t* status = "in") override;
Bool_t isOpen() override;
Bool_t isWritable() override;
void close() override;
void print() override;
Bool_t read(FairGeoMedia*) override { return kFALSE; }
Bool_t read(FairGeoSet*, FairGeoMedia*) override;
Bool_t write(FairGeoMedia*) override { return kFALSE; }
Bool_t write(FairGeoSet*) override { return kFALSE; }
Bool_t readGeomConfig(FairGeoInterface*) override { return kFALSE; }
Bool_t readDetectorSetup(FairGeoInterface*) { return kFALSE; }
Bool_t setSimulRefRun(const char*) { return kTRUE; }
Bool_t setHistoryDate(const char*) { return kTRUE; }
Bool_t setSimulRefRun(const char*) override { return kTRUE; }
Bool_t setHistoryDate(const char*) override { return kTRUE; }

private:
Bool_t calculateShapePoints(Double_t*, FairGeoNode*);
FairGeoOldAsciiIo(const FairGeoOldAsciiIo&);
FairGeoOldAsciiIo& operator=(const FairGeoOldAsciiIo&);

ClassDef(FairGeoOldAsciiIo, 0); //
ClassDefOverride(FairGeoOldAsciiIo, 0); //
};

#endif /* !FAIRGEOOLDASCIIIO_H */
12 changes: 6 additions & 6 deletions geobase/FairGeoPcon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ class FairGeoPcon : public FairGeoBasicShape
public:
FairGeoPcon();
~FairGeoPcon();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
Int_t readPoints(std::fstream*, FairGeoVolume*);
Bool_t writePoints(std::fstream*, FairGeoVolume*);
void printPoints(FairGeoVolume* volu);
ClassDef(FairGeoPcon, 0); //
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
void printPoints(FairGeoVolume* volu) override;
ClassDefOverride(FairGeoPcon, 0); //
};

#endif /* !FAIRGEOPCON_H */
12 changes: 6 additions & 6 deletions geobase/FairGeoPgon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ class FairGeoPgon : public FairGeoBasicShape
public:
FairGeoPgon();
~FairGeoPgon();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
Int_t readPoints(std::fstream*, FairGeoVolume*);
Bool_t writePoints(std::fstream*, FairGeoVolume*);
void printPoints(FairGeoVolume* volu);
ClassDef(FairGeoPgon, 0); //
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
void printPoints(FairGeoVolume* volu) override;
ClassDefOverride(FairGeoPgon, 0); //
};

#endif /* !FAIRGEOPGON_H */
8 changes: 4 additions & 4 deletions geobase/FairGeoRootBuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ class FairGeoRootBuilder : public FairGeoBuilder
FairGeoRootBuilder(const char*, const char*);
~FairGeoRootBuilder() {}
void setGeoManager(TGeoManager* me) { geoManager = me; }
Bool_t createNode(FairGeoNode*, Int_t hadFormat = 0);
Int_t createMedium(FairGeoMedium*);
void finalize();
Bool_t createNode(FairGeoNode*, Int_t hadFormat = 0) override;
Int_t createMedium(FairGeoMedium*) override;
void finalize() override;
void checkOverlaps(Double_t ovlp = 0.0001);
ClassDef(FairGeoRootBuilder, 0); //
ClassDefOverride(FairGeoRootBuilder, 0); //
};

#endif /* !FAIRGEOROOTBUILDER_H */
12 changes: 6 additions & 6 deletions geobase/FairGeoSphe.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ class FairGeoSphe : public FairGeoBasicShape
public:
FairGeoSphe();
~FairGeoSphe();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
Int_t readPoints(std::fstream*, FairGeoVolume*);
Bool_t writePoints(std::fstream*, FairGeoVolume*);
void printPoints(FairGeoVolume* volu);
ClassDef(FairGeoSphe, 0); //
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
void printPoints(FairGeoVolume* volu) override;
ClassDefOverride(FairGeoSphe, 0); //
};

#endif /* !FAIRGEOSPHE_H */
12 changes: 6 additions & 6 deletions geobase/FairGeoTorus.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ class FairGeoTorus : public FairGeoBasicShape
public:
FairGeoTorus();
~FairGeoTorus();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
Int_t readPoints(std::fstream* pFile, FairGeoVolume* volu);
Bool_t writePoints(std::fstream*, FairGeoVolume*);
void printPoints(FairGeoVolume* volu);
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
Int_t readPoints(std::fstream* pFile, FairGeoVolume* volu) override;
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
void printPoints(FairGeoVolume* volu) override;

ClassDef(FairGeoTorus, 0); // class for geometry shape TORUS
ClassDefOverride(FairGeoTorus, 0); // class for geometry shape TORUS
};

#endif /* !FAIRGEOTORUS_H */
6 changes: 3 additions & 3 deletions geobase/FairGeoTrap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ class FairGeoTrap : public FairGeoBasicShape
public:
FairGeoTrap();
~FairGeoTrap();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
ClassDef(FairGeoTrap, 0); // class for geometry shape TRAP
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
ClassDefOverride(FairGeoTrap, 0); // class for geometry shape TRAP
};

#endif /* !FAIRGEOTRAP_H */
6 changes: 3 additions & 3 deletions geobase/FairGeoTrd1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ class FairGeoTrd1 : public FairGeoBasicShape
public:
FairGeoTrd1();
~FairGeoTrd1();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;

ClassDef(FairGeoTrd1, 0); // class for geometry shape TRD1
ClassDefOverride(FairGeoTrd1, 0); // class for geometry shape TRD1
};

#endif /* !FAIRGEOTRD1_H */
12 changes: 6 additions & 6 deletions geobase/FairGeoTube.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ class FairGeoTube : public FairGeoBasicShape
public:
FairGeoTube();
~FairGeoTube();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
Int_t readPoints(std::fstream*, FairGeoVolume*);
Bool_t writePoints(std::fstream*, FairGeoVolume*);
void printPoints(FairGeoVolume* volu);
ClassDef(FairGeoTube, 0); // class for geometry shape TUBE
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
void printPoints(FairGeoVolume* volu) override;
ClassDefOverride(FairGeoTube, 0); // class for geometry shape TUBE
};

#endif /* !FAIRGEOTUBE_H */
12 changes: 6 additions & 6 deletions geobase/FairGeoTubs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ class FairGeoTubs : public FairGeoBasicShape
public:
FairGeoTubs();
~FairGeoTubs();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
Int_t readPoints(std::fstream*, FairGeoVolume*);
Bool_t writePoints(std::fstream*, FairGeoVolume*);
void printPoints(FairGeoVolume* volu);
ClassDef(FairGeoTubs, 0); // class for geometry shape TUBS
TArrayD* calcVoluParam(FairGeoVolume*) override;
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
void printPoints(FairGeoVolume* volu) override;
ClassDefOverride(FairGeoTubs, 0); // class for geometry shape TUBS
};

#endif /* !FAIRGEOTUBS_H */

0 comments on commit 224598b

Please sign in to comment.