Skip to content

Commit

Permalink
Re-apply format after ClassDef change
Browse files Browse the repository at this point in the history
  • Loading branch information
rbx authored and dennisklein committed Apr 29, 2020
1 parent 8aa08a5 commit 5a7fe3d
Show file tree
Hide file tree
Showing 25 changed files with 42 additions and 33 deletions.
3 changes: 2 additions & 1 deletion base/field/FairFieldFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ class FairFieldFactory

ClassDef(FairFieldFactory, 1);

private : FairFieldFactory(const FairFieldFactory& M);
private:
FairFieldFactory(const FairFieldFactory& M);
FairFieldFactory& operator=(const FairFieldFactory&) { return *this; }
};

Expand Down
3 changes: 2 additions & 1 deletion base/sim/FairBaseParSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ class FairBaseParSet : public FairParGenericSet

ClassDef(FairBaseParSet, 6);

private : FairBaseParSet(const FairBaseParSet& L);
private:
FairBaseParSet(const FairBaseParSet& L);
FairBaseParSet& operator=(const FairBaseParSet&) { return *this; }
};

Expand Down
4 changes: 3 additions & 1 deletion base/sim/FairGeaneApplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ class FairGeaneApplication : public TVirtualMCApplication

// Interface to MonteCarlo application
ClassDef(FairGeaneApplication, 1);
private : FairGeaneApplication(const FairGeaneApplication&);

private:
FairGeaneApplication(const FairGeaneApplication&);
FairGeaneApplication& operator=(const FairGeaneApplication&);
};

Expand Down
3 changes: 2 additions & 1 deletion base/sim/FairGeoParSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ class FairGeoParSet : public FairParGenericSet
TGeoManager* fGeom;
ClassDef(FairGeoParSet, 1);

private : FairGeoParSet(const FairGeoParSet& L);
private:
FairGeoParSet(const FairGeoParSet& L);
FairGeoParSet& operator=(const FairGeoParSet&) { return *this; }
};

Expand Down
7 changes: 3 additions & 4 deletions base/sim/FairMCApplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,9 @@ class FairMCApplication : public TVirtualMCApplication

ClassDef(FairMCApplication, 4);

private
:
/** Protected copy constructor */
FairMCApplication(const FairMCApplication&);
private:
/** Protected copy constructor */
FairMCApplication(const FairMCApplication&);
/** Protected assignment operator */
FairMCApplication& operator=(const FairMCApplication&);

Expand Down
2 changes: 1 addition & 1 deletion examples/MQ/pixelDetector/src/PixelContFact.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class PixelContFact : public FairContFact
PixelContFact();
~PixelContFact() {}
FairParSet* createContainer(FairContainer*);
ClassDef(PixelContFact, 0); // Factory for all Pixel parameter containers
ClassDef(PixelContFact, 0); // Factory for all Pixel parameter containers
};

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FairTestDetectorContFact : public FairContFact
FairTestDetectorContFact();
~FairTestDetectorContFact() {}
FairParSet* createContainer(FairContainer*);

// Factory for all FairTestDetector parameter containers
ClassDef(FairTestDetectorContFact, 0);
};
Expand Down
2 changes: 1 addition & 1 deletion examples/common/passive/FairGeoCave.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class FairGeoCave : public FairGeoSet
void write(std::fstream&);
void print();

ClassDef(FairGeoCave, 0); // Class for the geometry of CAVE
ClassDef(FairGeoCave, 0); // Class for the geometry of CAVE
};

#endif /* !PNDGEOCAVE_H */
2 changes: 1 addition & 1 deletion examples/common/passive/FairGeoMagnet.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FairGeoMagnet : public FairGeoSet
~FairGeoMagnet() {}
const char* getModuleName(Int_t) { return modName; }
const char* getEleName(Int_t) { return eleName; }
ClassDef(FairGeoMagnet, 0); // Class for the geometry of Magnet
ClassDef(FairGeoMagnet, 0); // Class for the geometry of Magnet
};

#endif /* !FAIRGEOMAGNET_H */
2 changes: 1 addition & 1 deletion examples/common/passive/FairGeoPipe.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class FairGeoPipe : public FairGeoSet
const char* getModuleName(Int_t) { return modName; }
const char* getEleName(Int_t) { return eleName; }
Bool_t create(FairGeoBuilder*);
ClassDef(FairGeoPipe, 0); // Class for geometry of beam pipe
ClassDef(FairGeoPipe, 0); // Class for geometry of beam pipe
};

#endif /* !PNDGEOPIPE_H */
2 changes: 1 addition & 1 deletion examples/common/passive/FairGeoTarget.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class FairGeoTarget : public FairGeoSet
~FairGeoTarget() {}
const char* getModuleName(Int_t) { return modName; }
const char* getEleName(Int_t) { return eleName; }
ClassDef(FairGeoTarget, 0); // Class for geometry of Target
ClassDef(FairGeoTarget, 0); // Class for geometry of Target
};

#endif /* !PNDGEOTARGET_H */
2 changes: 1 addition & 1 deletion examples/common/passive/FairPassiveContFact.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class FairPassiveContFact : public FairContFact
~FairPassiveContFact() {}
FairParSet* createContainer(FairContainer*);

ClassDef(FairPassiveContFact, 0); // Factory for all Passive parameter containers
ClassDef(FairPassiveContFact, 0); // Factory for all Passive parameter containers
};

#endif /* !PNDPASSIVECONTFACT_H */
2 changes: 1 addition & 1 deletion examples/common/passive/FairPipe.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class FairPipe : public FairModule

private:
FairPipe(const FairPipe& rhs);
ClassDef(FairPipe, 1); // PNDPIPE
ClassDef(FairPipe, 1); // PNDPIPE
};

#endif // PIPE_H
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FairTutorialDet1ContFact : public FairContFact
FairTutorialDet1ContFact();
~FairTutorialDet1ContFact() {}
FairParSet* createContainer(FairContainer*);
ClassDef(FairTutorialDet1ContFact, 0); // Factory for all MyDet parameter containers
ClassDef(FairTutorialDet1ContFact, 0); // Factory for all MyDet parameter containers
};

#endif /* !FAIRTUTORIALDETCONTFACT_H */
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FairTutorialDet2ContFact : public FairContFact
FairTutorialDet2ContFact();
~FairTutorialDet2ContFact() {}
FairParSet* createContainer(FairContainer*);
ClassDef(FairTutorialDet2ContFact, 0); // Factory for all MyDet parameter containers
ClassDef(FairTutorialDet2ContFact, 0); // Factory for all MyDet parameter containers
};

#endif /* !FAIRTUTORIALDETCONTFACT_H */
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FairTutorialDet4ContFact : public FairContFact
FairTutorialDet4ContFact();
~FairTutorialDet4ContFact() {}
FairParSet* createContainer(FairContainer*);
ClassDef(FairTutorialDet4ContFact, 0); // Factory for all MyDet parameter containers
ClassDef(FairTutorialDet4ContFact, 0); // Factory for all MyDet parameter containers
};

#endif /* !FAIRTUTORIALDETCONTFACT_H */
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FairRutherfordContFact : public FairContFact
FairRutherfordContFact();
~FairRutherfordContFact() {}
FairParSet* createContainer(FairContainer*);
ClassDef(FairRutherfordContFact, 0); // Factory for all FairRutherford parameter containers
ClassDef(FairRutherfordContFact, 0); // Factory for all FairRutherford parameter containers
};

#endif
9 changes: 5 additions & 4 deletions geane/FairGeane.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@ class FairGeane : public FairTask

ClassDef(FairGeane, 1);

protected : FairGeaneApplication* fApp; //!
const char* fName; //!
TString fUserConfig; //!
TString fUserCuts; //!
protected:
FairGeaneApplication* fApp; //!
const char* fName; //!
TString fUserConfig; //!
TString fUserCuts; //!

private:
FairGeane(const FairGeane&);
Expand Down
2 changes: 1 addition & 1 deletion geobase/FairGeoAsciiIo.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class FairGeoAsciiIo : public FairGeoIo
private:
FairGeoAsciiIo(const FairGeoAsciiIo&);
FairGeoAsciiIo& operator=(const FairGeoAsciiIo&);
ClassDef(FairGeoAsciiIo, 0); // Class for geometry I/O from ASCII file
ClassDef(FairGeoAsciiIo, 0); // Class for geometry I/O from ASCII file
};

#endif /* !FAIRGEOASCIIIO_H */
2 changes: 1 addition & 1 deletion geobase/FairGeoAssembly.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class FairGeoAssembly : public FairGeoBasicShape
Bool_t writePoints(std::fstream*, FairGeoVolume*);
void printPoints(FairGeoVolume* volu);

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

#endif /* !FAIRGEOASSEMBLY_H */
5 changes: 3 additions & 2 deletions geobase/FairGeoBasicShape.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ class FairGeoBasicShape : public TNamed

protected:
void posInMother(const FairGeoTransform&, const FairGeoTransform&);
ClassDef(FairGeoBasicShape, 0); // base class for all shapes
private : FairGeoBasicShape(const FairGeoBasicShape&);
ClassDef(FairGeoBasicShape, 0); // base class for all shapes
private:
FairGeoBasicShape(const FairGeoBasicShape&);
FairGeoBasicShape& operator=(const FairGeoBasicShape&);
};

Expand Down
2 changes: 1 addition & 1 deletion geobase/FairGeoBrik.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FairGeoBrik : public FairGeoBasicShape
~FairGeoBrik();
TArrayD* calcVoluParam(FairGeoVolume*);
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
ClassDef(FairGeoBrik, 0); // class for geometry shape BOX or BRIK
ClassDef(FairGeoBrik, 0); // class for geometry shape BOX or BRIK
};

#endif /* !FAIRGEOBRIK_H */
3 changes: 2 additions & 1 deletion geobase/FairGeoCompositeVolume.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class FairGeoCompositeVolume : public FairGeoVolume
void print();
ClassDef(FairGeoCompositeVolume, 1);

private : FairGeoCompositeVolume(const FairGeoCompositeVolume&);
private:
FairGeoCompositeVolume(const FairGeoCompositeVolume&);
FairGeoCompositeVolume& operator=(const FairGeoCompositeVolume&);
};

Expand Down
3 changes: 2 additions & 1 deletion geobase/FairGeoSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ class FairGeoSet : public TNamed
void compare(FairGeoSet&);
ClassDef(FairGeoSet, 0); //

private : FairGeoSet(const FairGeoSet&);
private:
FairGeoSet(const FairGeoSet&);
FairGeoSet& operator=(const FairGeoSet&);
};

Expand Down
5 changes: 3 additions & 2 deletions parbase/FairContFact.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ class FairContFact : public TNamed
return (static_cast<FairContainer*>(containers->FindObject(name)))->getActualContext();
}
/** Fair Logger */
FairLogger* fLogger; //!
FairLogger* fLogger; //!
ClassDef(FairContFact, 0); // base class of all factories for parameter containers

private : FairContFact(const FairContFact&);
private:
FairContFact(const FairContFact&);
FairContFact& operator=(const FairContFact&);
};

Expand Down

0 comments on commit 5a7fe3d

Please sign in to comment.