Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .clang-format-ignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
*.json
# vendored FairRoot sources: keep upstream formatting
Detectors/3rdparty/FairRootBase/**
10 changes: 2 additions & 8 deletions Common/Field/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,17 @@
# or submit itself to any jurisdiction.

o2_add_library(Field
SOURCES src/MagFieldContFact.cxx
src/MagFieldFact.cxx
src/MagFieldFast.cxx
src/MagFieldParam.cxx
SOURCES src/MagFieldFast.cxx
src/MagneticField.cxx
src/MagneticWrapperChebyshev.cxx
src/FieldOriginBiasParam.cxx
src/ALICE3MagneticField.cxx
PUBLIC_LINK_LIBRARIES O2::MathUtils FairRoot::Base O2::CommonUtils)
PUBLIC_LINK_LIBRARIES O2::MathUtils O2::FairRootBase O2::CommonUtils)

o2_target_root_dictionary(Field
HEADERS include/Field/MagneticWrapperChebyshev.h
include/Field/MagneticField.h
include/Field/MagFieldParam.h
include/Field/MagFieldContFact.h
include/Field/MagFieldFast.h
include/Field/MagFieldFact.h
include/Field/FieldOriginBiasParam.h
include/Field/ALICE3MagneticField.h)

Expand Down
46 changes: 0 additions & 46 deletions Common/Field/include/Field/MagFieldContFact.h

This file was deleted.

49 changes: 0 additions & 49 deletions Common/Field/include/Field/MagFieldFact.h

This file was deleted.

48 changes: 9 additions & 39 deletions Common/Field/include/Field/MagFieldParam.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,24 @@
// or submit itself to any jurisdiction.

/// \file MagFieldParam.h
/// \brief Definition of the MagFieldParam: container for ALICE mag. field parameters
/// \brief Definition of the MagFieldParam: ALICE mag. field type enumerations
/// \author ruben.shahoyan@cern.ch

#ifndef ALICEO2_FIELD_MAGFIELDPARAM_H_
#define ALICEO2_FIELD_MAGFIELDPARAM_H_

#include "FairParGenericSet.h"
#include <TString.h>

class FairParamList;

namespace o2
{
namespace field
{

class MagneticField;

class MagFieldParam : public FairParGenericSet
{
public:
/// Field map and beam type enumerations.
///
/// This used to be a FairParGenericSet container written into the FairRoot
/// runtime database. That path was never populated nor read back in production
/// (field settings come from CCDB/SimConfig via SimFieldUtils), so only the
/// enumerations - which are used throughout O2 - are kept.
struct MagFieldParam {
enum BMap_t {
k2kG,
k5kG,
Expand All @@ -44,35 +41,8 @@ class MagFieldParam : public FairParGenericSet
kBeamTypepA,
kBeamTypeAp
};

MagFieldParam(const char* name = "", const char* title = "", const char* context = "");

void SetParam(const MagneticField* field);

BMap_t GetMapType() const { return mMapType; }
BeamType_t GetBeamType() const { return mBeamType; }
Int_t GetDefInt() const { return mDefaultIntegration; }
Double_t GetFactorSol() const { return mFactorSol; }
Double_t GetFactorDip() const { return mFactorDip; }
Double_t GetBeamEnergy() const { return mBeamEnergy; }
Double_t GetMaxField() const { return mMaxField; }
const char* GetMapPath() const { return mMapPath.Data(); }

void putParams(FairParamList* list) override;
Bool_t getParams(FairParamList* list) override;

private:
BMap_t mMapType; ///< map type ID
BeamType_t mBeamType; ///< beam type ID
Int_t mDefaultIntegration; ///< field integration type for MC
Double_t mFactorSol; ///< solenoid current factor
Double_t mFactorDip; ///< dipole current factor
Double_t mBeamEnergy; ///< beam energy
Double_t mMaxField; ///< max field for geant
TString mMapPath; ///< path to map file

ClassDefOverride(MagFieldParam, 1);
};

} // namespace field
} // namespace o2

Expand Down
7 changes: 0 additions & 7 deletions Common/Field/include/Field/MagneticField.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
#include "TNamed.h" // for TNamed
#include <memory> // for str::unique_ptr

class FairParamList;

namespace o2
{
namespace field
Expand Down Expand Up @@ -63,8 +61,6 @@ class MagneticField : public FairField
MagFieldParam::BeamType_t btype = MagFieldParam::kBeamTypepp, Double_t benergy = -1, Int_t integ = 2,
Double_t fmax = 15, const std::string path = "$(O2_ROOT)/share/Common/maps/mfchebKGI_sym.root");

MagneticField(const MagFieldParam& param);

MagneticField& operator=(const MagneticField& src);

/// Default destructor
Expand Down Expand Up @@ -147,9 +143,6 @@ class MagneticField : public FairField
/// 3d field query alias for Alias Method to calculate the field at point xyz
void GetBxyz(const Double_t p[3], Double_t* b) override { MagneticField::Field(p, b); }

/// Fill Paramater
void FillParContainer() override;

/// Method to calculate the integral_0^z of br,bt,bz
void getTPCIntegral(const Double_t* xyz, Double_t* b) const;

Expand Down
3 changes: 0 additions & 3 deletions Common/Field/src/FieldLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@

#pragma link C++ class o2::field::MagneticField + ;
#pragma link C++ class o2::field::MagneticWrapperChebyshev + ;
#pragma link C++ class o2::field::MagFieldParam + ;
#pragma link C++ class o2::field::MagFieldContFact + ;
#pragma link C++ class o2::field::MagFieldFact + ;
#pragma link C++ class o2::field::MagFieldFast + ;
#pragma link C++ class o2::field::ALICE3MagneticField + ;

Expand Down
54 changes: 0 additions & 54 deletions Common/Field/src/MagFieldContFact.cxx

This file was deleted.

50 changes: 0 additions & 50 deletions Common/Field/src/MagFieldFact.cxx

This file was deleted.

Loading
Loading