diff --git a/CMakeLists.txt b/CMakeLists.txt index 7797001c62241..96e0c24753939 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,6 +165,8 @@ add_subdirectory (its) add_subdirectory (passive) add_subdirectory (field) add_subdirectory (devices) +Add_Subdirectory(macro) + WRITE_CONFIG_FILE(config.sh) diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt index 4ebe3bca93ebd..88956c76bb6bf 100644 --- a/Data/CMakeLists.txt +++ b/Data/CMakeLists.txt @@ -21,7 +21,7 @@ MCTrack.cxx Set(HEADERS ) Set(LINKDEF DataLinkDef.h) -Set(LIBRARY_NAME AliceO2Data) +Set(LIBRARY_NAME O2Data) Set(DEPENDENCIES Base EG Physics Cint Core) GENERATE_LIBRARY() diff --git a/Generators/CMakeLists.txt b/Generators/CMakeLists.txt index 806ac16804ed6..31dd0244c8f69 100644 --- a/Generators/CMakeLists.txt +++ b/Generators/CMakeLists.txt @@ -26,8 +26,8 @@ Pythia8Generator.cxx ) set(LINKDEF GeneratorsLinkDef.h) -set(LIBRARY_NAME AliGen) +set(LIBRARY_NAME O2Gen) -set(DEPENDENCIES Base AliceO2Data pythia8 Pythia6) +set(DEPENDENCIES Base O2Data pythia8 Pythia6) GENERATE_LIBRARY() diff --git a/field/CMakeLists.txt b/field/CMakeLists.txt index b14c47d1c3df5..7275e04ac966d 100644 --- a/field/CMakeLists.txt +++ b/field/CMakeLists.txt @@ -29,7 +29,7 @@ Chebyshev3DCalc.cxx Set(HEADERS) Set(LINKDEF fieldLinkDef.h) -Set(LIBRARY_NAME AliceO2Field) +Set(LIBRARY_NAME Field) Set(DEPENDENCIES Base EG Physics Cint Core) GENERATE_LIBRARY() diff --git a/field/Chebyshev3D.h b/field/Chebyshev3D.h index db48d05d38e41..baa899d72e271 100644 --- a/field/Chebyshev3D.h +++ b/field/Chebyshev3D.h @@ -19,6 +19,7 @@ class TROOT; class stdio; class FairLogger; + namespace AliceO2 { namespace Field { @@ -54,6 +55,7 @@ namespace Field { /// H.Wind, CERN EP Internal Report, 81-12/Rev. class Chebyshev3D : public TNamed { public: + Chebyshev3D(); Chebyshev3D(const Chebyshev3D& src); Chebyshev3D(const char* inpFile); @@ -219,7 +221,7 @@ class Chebyshev3D : public TNamed { TMethodCall* mUserMacro; //! Pointer to MethodCall for function from user macro FairLogger* mLogger; //! - ClassDef(Chebyshev3D, 1) // Chebyshev parametrization for 3D->N function + ClassDef(AliceO2::Field::Chebyshev3D, 2) // Chebyshev parametrization for 3D->N function }; /// Checks if the point is inside of the fitted box diff --git a/field/Chebyshev3DCalc.h b/field/Chebyshev3DCalc.h index ae30f8e1726e4..9c7b9419a55a1 100644 --- a/field/Chebyshev3DCalc.h +++ b/field/Chebyshev3DCalc.h @@ -17,10 +17,12 @@ class TSystem; namespace AliceO2 { namespace Field { - class Chebyshev3DCalc : public TNamed { public: + + + /// Default constructor Chebyshev3DCalc(); /// Copy constructor @@ -156,7 +158,7 @@ class Chebyshev3DCalc : public TNamed { Float_t* mTemporaryCoefficients2D; //[mNumberOfColumns] temp. coeffs for 2d summation Float_t* mTemporaryCoefficients1D; //[mNumberOfRows] temp. coeffs for 1d summation - ClassDef(Chebyshev3DCalc, 1) // Class for interpolation of 3D->1 function by Chebyshev parametrization + ClassDef(AliceO2::Field::Chebyshev3DCalc, 2) // Class for interpolation of 3D->1 function by Chebyshev parametrization }; /// Evaluates 1D Chebyshev parameterization. x is the argument mapped to [-1:1] interval diff --git a/field/MagneticField.h b/field/MagneticField.h index e52548ddd0e41..7cdc6de55c564 100644 --- a/field/MagneticField.h +++ b/field/MagneticField.h @@ -223,7 +223,7 @@ class MagneticField : public TVirtualMagField { FairLogger* mLogger; - ClassDef(MagneticField, 1) // Class for all Alice MagField wrapper for measured data + Tosca parameterization + ClassDef(AliceO2::Field::MagneticField, 2) // Class for all Alice MagField wrapper for measured data + Tosca parameterization }; } } diff --git a/field/MagneticWrapperChebyshev.h b/field/MagneticWrapperChebyshev.h index 00fababf52327..17a030e5d77b3 100644 --- a/field/MagneticWrapperChebyshev.h +++ b/field/MagneticWrapperChebyshev.h @@ -42,6 +42,9 @@ namespace Field { class MagneticWrapperChebyshev : public TNamed { public: + + + /// Default constructor MagneticWrapperChebyshev(); @@ -396,7 +399,7 @@ class MagneticWrapperChebyshev : public TNamed { TObjArray* mParameterizationDipole; ///< Parameterization pieces for Dipole field FairLogger* mLogger; - ClassDef(MagneticWrapperChebyshev, 1) // Wrapper class for the set of Chebishev parameterizations of Alice mag.field + ClassDef(AliceO2::Field::MagneticWrapperChebyshev, 2) // Wrapper class for the set of Chebishev parameterizations of Alice mag.field }; /// Computes field in Cylindircal coordinates diff --git a/field/fieldLinkDef.h b/field/fieldLinkDef.h index 580fe61dd1a08..e330b43a90021 100644 --- a/field/fieldLinkDef.h +++ b/field/fieldLinkDef.h @@ -1,6 +1,5 @@ #ifdef __CINT__ - #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; @@ -10,4 +9,28 @@ #pragma link C++ class AliceO2::Field::MagneticWrapperChebyshev+; #pragma link C++ class AliceO2::Field::Chebyshev3DCalc+; +#pragma read sourceClass="AliCheb3D" targetClass="AliceO2::Field::Chebyshev3D" version="[1-]" source="Int_t fDimOut" target="Int_t mOutputArrayDimension" code="{ mOutputArrayDimension = onfile.fDimOut; }" + + +//Int_t fDimOut; // dimension of the ouput array +//Float_t fPrec; // requested precision +//Float_t fBMin[3]; // min boundaries in each dimension +//Float_t fBMax[3]; // max boundaries in each dimension +//Float_t fBScale[3]; // scale for boundary mapping to [-1:1] interval +//Float_t fBOffset[3]; // offset for boundary mapping to [-1:1] interval +//TObjArray fChebCalc; // Chebyshev parameterization for each output dimension + + +//Int_t mOutputArrayDimension; ///< dimension of the ouput array +//Float_t mPrecision; ///< requested precision +//Float_t mMinBoundaries[3]; ///< min boundaries in each dimension +//Float_t mMaxBoundaries[3]; ///< max boundaries in each dimension +//Float_t mBoundaryMappingScale[3]; ///< scale for boundary mapping to [-1:1] interval +//Float_t mBoundaryMappingOffset[3]; ///< offset for boundary mapping to [-1:1] interval +//TObjArray mChebyshevParameter; ///< Chebyshev parameterization for each output dimension + + + + + #endif diff --git a/its/CMakeLists.txt b/its/CMakeLists.txt index d9ec38a684dcf..8d56997e969e1 100644 --- a/its/CMakeLists.txt +++ b/its/CMakeLists.txt @@ -30,7 +30,7 @@ Point.cxx ) Set(LINKDEF itsLinkDef.h) -Set(LIBRARY_NAME AliceO2its) +Set(LIBRARY_NAME its) Set(DEPENDENCIES Base ) diff --git a/its/Detector.cxx b/its/Detector.cxx index 1dc33215632d8..9aba12e31c72f 100644 --- a/its/Detector.cxx +++ b/its/Detector.cxx @@ -334,9 +334,15 @@ Bool_t Detector::ProcessHits(FairVolume* vol) void Detector::createMaterials() { - Int_t ifield = ((AliceO2::Field::MagneticField*)TGeoGlobalMagField::Instance()->GetField())->Integral(); - Float_t fieldm = ((AliceO2::Field::MagneticField*)TGeoGlobalMagField::Instance()->GetField())->Max(); - + // Int_t ifield = ((AliceO2::Field::MagneticField*)TGeoGlobalMagField::Instance()->GetField())->Integral(); + // Float_t fieldm = ((AliceO2::Field::MagneticField*)TGeoGlobalMagField::Instance()->GetField())->Max(); + + // until we solve the problem of reading the field from files with changed class names we + // need to hard code some values here to be able to run the macros M.Al-Turany (Nov.14) + Int_t ifield = 10; + Float_t fieldm = 2.0; + //////////// + Float_t tmaxfd = 0.1; // 1.0; // Degree Float_t stemax = 1.0; // cm Float_t deemax = 0.1; // 30.0; // Fraction of particle's energy 0Load("libAliceO2Base"); - gSystem->Load("libAliceO2its"); + // gSystem->Load("libAliceO2Base"); + // gSystem->Load("libAliceO2its"); // Create simulation run FairRunSim* run = new FairRunSim(); @@ -38,7 +38,7 @@ void run_sim(Int_t nEvents = 10, TString mcEngine = "TGeant3") run->SetMaterials("media.geo"); // Materials // Create geometry - FairModule* cave = new AliCave("CAVE"); + AliceO2::Passive::Cave* cave = new AliceO2::Passive::Cave("CAVE"); cave->SetGeometryFileName("cave.geo"); run->AddModule(cave); @@ -46,7 +46,7 @@ void run_sim(Int_t nEvents = 10, TString mcEngine = "TGeant3") // tpc->SetGeometry(); // run->AddModule(tpc); - TGeoGlobalMagField::Instance()->SetField(new AliceO2::Field::MagneticField("Maps","Maps", -1., -1., AliceO2::Field::MagneticField::k5kG)); +// TGeoGlobalMagField::Instance()->SetField(new AliceO2::Field::MagneticField("Maps","Maps", -1., -1., AliceO2::Field::MagneticField::k5kG)); AliceO2::Base::Detector* its = new AliceO2::ITS::Detector("ITS", kTRUE, 7); run->AddModule(its); diff --git a/passive/CMakeLists.txt b/passive/CMakeLists.txt index a7d53aedb6bdc..4239087ae1ca0 100644 --- a/passive/CMakeLists.txt +++ b/passive/CMakeLists.txt @@ -20,11 +20,11 @@ ${FAIRROOT_LIBRARY_DIR} link_directories( ${LINK_DIRECTORIES}) set(SRCS -AliCave.cxx -AliPipe.cxx -AliGeoCave.cxx -AliMagnet.cxx -AliPassiveContFact.cxx +Cave.cxx +GeoCave.cxx +Pipe.cxx +Magnet.cxx +PassiveContFact.cxx ) Set(HEADERS ) diff --git a/passive/AliCave.cxx b/passive/Cave.cxx similarity index 84% rename from passive/AliCave.cxx rename to passive/Cave.cxx index 2e249af2f2551..5a07e164ec77d 100644 --- a/passive/AliCave.cxx +++ b/passive/Cave.cxx @@ -8,11 +8,11 @@ ********************************************************************************/ // ------------------------------------------------------------------------- -// ----- AliCave file ----- +// ----- Cave file ----- // ----- Created 26/03/14 by M. Al-Turany ----- // ------------------------------------------------------------------------- -#include "AliCave.h" -#include "AliGeoCave.h" // for AliGeoCave +#include "Cave.h" +#include "GeoCave.h" // for AliGeoCave #include "FairGeoInterface.h" // for FairGeoInterface #include "FairGeoLoader.h" // for FairGeoLoader #include "FairGeoNode.h" // for FairGeoNode @@ -27,29 +27,33 @@ #include // for NULL -ClassImp(AliCave) +using namespace AliceO2::Passive; -void AliCave::ConstructGeometry() +ClassImp(AliceO2::Passive::Cave) + + + +void Cave::ConstructGeometry() { FairGeoLoader* loader=FairGeoLoader::Instance(); FairGeoInterface* GeoInterface =loader->getGeoInterface(); - AliGeoCave* MGeo=new AliGeoCave(); + GeoCave* MGeo=new GeoCave(); MGeo->setGeomFile(GetGeometryFileName()); GeoInterface->addGeoModule(MGeo); Bool_t rc = GeoInterface->readSet(MGeo); if ( rc ) { MGeo->create(loader->getGeoBuilder()); } } -AliCave::AliCave() +Cave::Cave() :FairModule() { } -AliCave::~AliCave() +Cave::~Cave() { } -AliCave::AliCave(const char* name, const char* Title) +Cave::Cave(const char* name, const char* Title) : FairModule(name ,Title) { world[0] = 0; diff --git a/passive/AliCave.h b/passive/Cave.h similarity index 70% rename from passive/AliCave.h rename to passive/Cave.h index d344bcdeb4215..0b357b430c721 100644 --- a/passive/AliCave.h +++ b/passive/Cave.h @@ -7,31 +7,33 @@ ********************************************************************************/ // ------------------------------------------------------------------------- -// ----- AliCave file ----- +// ----- Cave file ----- // ----- Created 26/03/14 by M. Al-Turany ----- // ------------------------------------------------------------------------- -#ifndef Cave_H -#define Cave_H +#ifndef ALICEO2_PASSIVE_Cave_H +#define ALICEO2_PASSIVE_Cave_H #include "FairModule.h" // for FairModule +#include "Rtypes.h" // for ClassDef, etc +namespace AliceO2 { +namespace Passive { -#include "Rtypes.h" // for AliCave::Class, ClassDef, etc - -class AliCave : public FairModule +class Cave : public FairModule { public: - AliCave(const char* name, const char* Title="Exp Cave"); - AliCave(); - virtual ~AliCave(); + Cave(const char* name, const char* Title="Exp Cave"); + Cave(); + virtual ~Cave(); virtual void ConstructGeometry(); private: Double_t world[3]; - ClassDef(AliCave,1) //PNDCaveSD + ClassDef(AliceO2::Passive::Cave,1) // }; - +} +} #endif //Cave_H diff --git a/passive/AliGeoCave.cxx b/passive/GeoCave.cxx similarity index 91% rename from passive/AliGeoCave.cxx rename to passive/GeoCave.cxx index a66a96f2a83a2..9324995b7c427 100644 --- a/passive/AliGeoCave.cxx +++ b/passive/GeoCave.cxx @@ -7,18 +7,18 @@ ********************************************************************************/ // ------------------------------------------------------------------------- -// ----- AliGeoCave file ----- +// ----- GeoCave file ----- // ----- Created 26/03/14 by M. Al-Turany ----- // ------------------------------------------------------------------------- ///////////////////////////////////////////////////////////// -// AliGeoCave +// GeoCave // // Class for the geometry of the detector part CAVE // ///////////////////////////////////////////////////////////// -#include "AliGeoCave.h" +#include "GeoCave.h" #include "FairGeoBasicShape.h" // for FairGeoBasicShape #include "FairGeoMedia.h" // for FairGeoMedia @@ -32,9 +32,10 @@ #include // for cout using namespace std; -ClassImp(AliGeoCave) +using namespace AliceO2::Passive; +ClassImp(AliceO2::Passive::GeoCave) -AliGeoCave::AliGeoCave() +GeoCave::GeoCave() : FairGeoSet(), name("cave") { @@ -44,7 +45,7 @@ AliGeoCave::AliGeoCave() maxModules=1; } -Bool_t AliGeoCave::read(fstream& fin,FairGeoMedia* media) +Bool_t GeoCave::read(fstream& fin,FairGeoMedia* media) { // Reads the geometry from file if (!media) { return kFALSE; } @@ -90,14 +91,14 @@ Bool_t AliGeoCave::read(fstream& fin,FairGeoMedia* media) return rc; } -void AliGeoCave::addRefNodes() +void GeoCave::addRefNodes() { // Adds the reference node FairGeoNode* volu=getVolume(name); if (volu) { masterNodes->Add(new FairGeoNode(*volu)); } } -void AliGeoCave::write(fstream& fout) +void GeoCave::write(fstream& fout) { // Writes the geometry to file fout.setf(ios::fixed,ios::floatfield); @@ -112,7 +113,7 @@ void AliGeoCave::write(fstream& fout) } } -void AliGeoCave::print() +void GeoCave::print() { // Prints the geometry FairGeoNode* volu=getVolume(name); diff --git a/passive/AliGeoCave.h b/passive/GeoCave.h similarity index 85% rename from passive/AliGeoCave.h rename to passive/GeoCave.h index d8beb45a7dbad..6b3305ce3475e 100644 --- a/passive/AliGeoCave.h +++ b/passive/GeoCave.h @@ -13,8 +13,8 @@ // ------------------------------------------------------------------------- -#ifndef MYGEOCAVE_H -#define MYGEOCAVE_H +#ifndef ALICEO2_PASSIVE_GEOCAVE_H +#define ALICEO2_PASSIVE_GEOCAVE_H #include "FairGeoSet.h" // for FairGeoSet #include "Riosfwd.h" // for fstream @@ -24,20 +24,23 @@ #include // for fstream class FairGeoMedia; +namespace AliceO2 { +namespace Passive { -class AliGeoCave : public FairGeoSet +class GeoCave : public FairGeoSet { protected: TString name; public: - AliGeoCave(); - ~AliGeoCave() {} + GeoCave(); + ~GeoCave() {} const char* getModuleName(Int_t) {return name.Data();} Bool_t read(fstream&,FairGeoMedia*); void addRefNodes(); void write(fstream&); void print(); - ClassDef(AliGeoCave,0) // Class for the geometry of CAVE + ClassDef(AliceO2::Passive::GeoCave,0) // Class for the geometry of CAVE }; - +} +} #endif /* !PNDGEOCAVE_H */ diff --git a/passive/AliMagnet.cxx b/passive/Magnet.cxx similarity index 91% rename from passive/AliMagnet.cxx rename to passive/Magnet.cxx index 874614f0e4a7a..364ffb78d747d 100644 --- a/passive/AliMagnet.cxx +++ b/passive/Magnet.cxx @@ -7,11 +7,11 @@ ********************************************************************************/ // ------------------------------------------------------------------------- -// ----- AliMagnet file ----- +// ----- Magnet file ----- // ----- Created 26/03/14 by M. Al-Turany ----- // ------------------------------------------------------------------------- -#include "AliMagnet.h" +#include "Magnet.h" #include "TGeoManager.h" #include "FairRun.h" // for FairRun @@ -29,22 +29,23 @@ #include // for NULL #include // for operator<<, basic_ostream, etc +using namespace AliceO2::Passive; -AliMagnet::~AliMagnet() +Magnet::~Magnet() { } -AliMagnet::AliMagnet() - : FairModule("AliMagnet", "") +Magnet::Magnet() + : FairModule("Magnet", "") { } -AliMagnet::AliMagnet(const char* name, const char* Title) +Magnet::Magnet(const char* name, const char* Title) : FairModule(name ,Title) { } -void AliMagnet::ConstructGeometry() +void Magnet::ConstructGeometry() { TGeoVolume *top=gGeoManager->GetTopVolume(); @@ -96,8 +97,7 @@ void AliMagnet::ConstructGeometry() } - -ClassImp(AliMagnet) +ClassImp(AliceO2::Passive::Magnet) diff --git a/passive/AliMagnet.h b/passive/Magnet.h similarity index 69% rename from passive/AliMagnet.h rename to passive/Magnet.h index 56173d74debf1..62a1b96d15647 100644 --- a/passive/AliMagnet.h +++ b/passive/Magnet.h @@ -7,28 +7,33 @@ ********************************************************************************/ // ------------------------------------------------------------------------- -// ----- AliMagnet file ----- +// ----- Magnet file ----- // ----- Created 26/03/14 by M. Al-Turany ----- // ------------------------------------------------------------------------- -#ifndef MAGNET_H -#define MAGNET_H +#ifndef ALICEO2_PASSIVE_MAGNET_H +#define ALICEO2_PASSIVE_MAGNET_H #include "FairModule.h" // for FairModule -#include "Rtypes.h" // for AliMagnet::Class, Bool_t, etc +#include "Rtypes.h" // for Magnet::Class, Bool_t, etc #include // for string +namespace AliceO2 { +namespace Passive { -class AliMagnet : public FairModule +class Magnet : public FairModule { public: - AliMagnet(const char* name, const char* Title="MY Magnet"); - AliMagnet(); - virtual ~AliMagnet(); + Magnet(const char* name, const char* Title="MY Magnet"); + Magnet(); + virtual ~Magnet(); void ConstructGeometry(); - ClassDef(AliMagnet,1) + ClassDef(AliceO2::Passive::Magnet,1) }; +} +} + #endif //MAGNET_H diff --git a/passive/AliPassiveContFact.cxx b/passive/PassiveContFact.cxx similarity index 85% rename from passive/AliPassiveContFact.cxx rename to passive/PassiveContFact.cxx index 0ce79ef79bb7d..b50006dab3a61 100644 --- a/passive/AliPassiveContFact.cxx +++ b/passive/PassiveContFact.cxx @@ -7,7 +7,7 @@ ********************************************************************************/ // ------------------------------------------------------------------------- -// ----- AliPassiveContFact file ----- +// ----- PassiveContFact file ----- // ----- Created 26/03/14 by M. Al-Turany ----- // ------------------------------------------------------------------------- @@ -17,39 +17,36 @@ ///////////////////////////////////////////////////////////// // -// AliPassiveContFact +// PassiveContFact // // Factory for the parameter containers in libPassive // ///////////////////////////////////////////////////////////// -#include "AliPassiveContFact.h" - +#include "PassiveContFact.h" #include "FairRuntimeDb.h" // for FairRuntimeDb - #include "TList.h" // for TList #include "TString.h" // for TString - #include // for strcmp, NULL -class FairParSet; using namespace std; +using namespace AliceO2::Passive; -ClassImp(AliPassiveContFact) +ClassImp(AliceO2::Passive::PassiveContFact) -static AliPassiveContFact gAliPassiveContFact; +static PassiveContFact gPassiveContFact; -AliPassiveContFact::AliPassiveContFact() +PassiveContFact::PassiveContFact() : FairContFact() { // Constructor (called when the library is loaded) - fName="AliPassiveContFact"; + fName="PassiveContFact"; fTitle="Factory for parameter containers in libPassive"; setAllContainers(); FairRuntimeDb::instance()->addContFactory(this); } -void AliPassiveContFact::setAllContainers() +void PassiveContFact::setAllContainers() { /** Creates the Container objects with all accepted contexts and adds them to * the list of containers for the STS library.*/ @@ -62,7 +59,7 @@ void AliPassiveContFact::setAllContainers() containers->Add(p); } -FairParSet* AliPassiveContFact::createContainer(FairContainer* c) +FairParSet* PassiveContFact::createContainer(FairContainer* c) { /** Calls the constructor of the corresponding parameter container. * For an actual context, which is not an empty string and not the default context diff --git a/passive/AliPassiveContFact.h b/passive/PassiveContFact.h similarity index 79% rename from passive/AliPassiveContFact.h rename to passive/PassiveContFact.h index 90b11f5daf0bf..cbcc9b8f762f9 100644 --- a/passive/AliPassiveContFact.h +++ b/passive/PassiveContFact.h @@ -12,23 +12,27 @@ // ------------------------------------------------------------------------- -#ifndef PNDPASSIVECONTFACT_H -#define PNDPASSIVECONTFACT_H +#ifndef ALICEO2_PASSIVE_CONTFACT_H +#define ALICEO2_PASSIVE_CONTFACT_H #include "FairContFact.h" // for FairContFact, etc #include "Rtypes.h" // for AliPassiveContFact::Class, etc class FairParSet; -class AliPassiveContFact : public FairContFact +namespace AliceO2 { +namespace Passive { + +class PassiveContFact : public FairContFact { private: void setAllContainers(); public: - AliPassiveContFact(); - ~AliPassiveContFact() {} + PassiveContFact(); + virtual ~PassiveContFact() {;} FairParSet* createContainer(FairContainer*); - ClassDef( AliPassiveContFact,0) // Factory for all Passive parameter containers + ClassDef(AliceO2::Passive::PassiveContFact,0) // Factory for all Passive parameter containers }; - +} +} #endif /* !PNDPASSIVECONTFACT_H */ diff --git a/passive/PassiveLinkDef.h b/passive/PassiveLinkDef.h index 78680d4c1988d..05b2188338899 100644 --- a/passive/PassiveLinkDef.h +++ b/passive/PassiveLinkDef.h @@ -17,11 +17,11 @@ #pragma link off all classes; #pragma link off all functions; -#pragma link C++ class AliMagnet+; -#pragma link C++ class AliCave+; -#pragma link C++ class AliGeoCave; -#pragma link C++ class AliPassiveContFact; -#pragma link C++ class AliPipe+; +#pragma link C++ class AliceO2::Passive::Magnet+; +#pragma link C++ class AliceO2::Passive::Cave+; +#pragma link C++ class AliceO2::Passive::GeoCave; +#pragma link C++ class AliceO2::Passive::PassiveContFact; +#pragma link C++ class AliceO2::Passive::Pipe+; #endif diff --git a/passive/AliPipe.cxx b/passive/Pipe.cxx similarity index 85% rename from passive/AliPipe.cxx rename to passive/Pipe.cxx index a07280f79516d..b24b08b659153 100644 --- a/passive/AliPipe.cxx +++ b/passive/Pipe.cxx @@ -7,11 +7,11 @@ ********************************************************************************/ // ------------------------------------------------------------------------- -// ----- AliPipe file ----- +// ----- Pipe file ----- // ----- Created by M. Al-Turany June 2014 ----- // ------------------------------------------------------------------------- -#include "AliPipe.h" +#include "Pipe.h" #include "TList.h" #include "TObjArray.h" @@ -21,23 +21,24 @@ #include "TGeoMedium.h" #include "TGeoManager.h" +using namespace AliceO2::Passive; -AliPipe::~AliPipe() +Pipe::~Pipe() { } -AliPipe::AliPipe() +Pipe::Pipe() : FairModule() { } -AliPipe::AliPipe(const char * name, const char * title) +Pipe::Pipe(const char * name, const char * title) : FairModule(name ,title) { } // ----- ConstructGeometry -------------------------------------------------- -void AliPipe::ConstructGeometry() +void Pipe::ConstructGeometry() { TGeoVolume *top=gGeoManager->GetTopVolume(); @@ -60,7 +61,7 @@ void AliPipe::ConstructGeometry() } // ---> Volume - TGeoVolume* pipe = new TGeoVolume("AliPipe", shape, Carbon); + TGeoVolume* pipe = new TGeoVolume("Pipe", shape, Carbon); // --Now create the same but diameter less by Thikness and vacuum instead of Carbon TGeoPcon* Vshape = new TGeoPcon(0., 360., nSects); @@ -69,7 +70,7 @@ void AliPipe::ConstructGeometry() } // ---> Volume - TGeoVolume* Vpipe = new TGeoVolume("AliPipe", shape, Vacuum); + TGeoVolume* Vpipe = new TGeoVolume("Pipe", shape, Vacuum); top->AddNode(pipe, 1); top->AddNode(Vpipe, 1); @@ -80,5 +81,5 @@ void AliPipe::ConstructGeometry() -ClassImp(AliPipe) +ClassImp(AliceO2::Passive::Pipe) diff --git a/passive/AliPipe.h b/passive/Pipe.h similarity index 79% rename from passive/AliPipe.h rename to passive/Pipe.h index e5ec19b5ed7b3..d5f48685f4c45 100644 --- a/passive/AliPipe.h +++ b/passive/Pipe.h @@ -11,22 +11,26 @@ // ----- Created by M. Al-Turany June 2014 ----- // ------------------------------------------------------------------------- -#ifndef PIPE_H -#define PIPE_H +#ifndef ALICEO2_PASSIVE_PIPE_H +#define ALICEO2_PASSIVE_PIPE_H #include "FairModule.h" +namespace AliceO2 { +namespace Passive { + -class AliPipe : public FairModule { +class Pipe : public FairModule { public: - AliPipe(const char * name, const char *Title="Ali Pipe"); - AliPipe(); + Pipe(const char * name, const char *Title="Alice Pipe"); + Pipe(); - virtual ~AliPipe(); + virtual ~Pipe(); virtual void ConstructGeometry(); - ClassDef(AliPipe,1) //AliPIPE + ClassDef(Pipe,1) //PIPE }; - +} +} #endif //PIPE_H