Skip to content

Please consider the following formatting changes to #15551 #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alibuild wants to merge 1 commit into
base: pr15551
Choose a base branch
from
Open

Please consider the following formatting changes to #15551 #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions Detectors/TPC/spacecharge/src/DataContainer3D.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ int DataContainer3D<DataT>::writeToFile(TFile& outf, const char* name) const
return 0;
}



/// set values from file
template <typename DataT>
template <typename DataTIn>
Expand Down Expand Up @@ -123,7 +121,6 @@ void DataContainer3D<DataT>::print() const
LOGP(info, "{} \n \n", stream.str());
}


template <typename DataT>
DataContainer3D<DataT>& DataContainer3D<DataT>::operator*=(const DataT value)
{
Expand Down Expand Up @@ -217,15 +214,13 @@ void DataContainer3D<DataT>::setGrid(unsigned short nZ, unsigned short nR, unsig
}
}


template <typename DataT>
DataT DataContainer3D<DataT>::interpolate(const DataT z, const DataT r, const DataT phi, const o2::tpc::RegularGrid3D<DataT>& grid) const
{
TriCubicInterpolator<DataT> interpolator(*this, grid);
return interpolator(z, r, phi);
}


template <typename DataT>
bool DataContainer3D<DataT>::getVertices(std::string_view treename, std::string_view fileIn, unsigned short& nR, unsigned short& nZ, unsigned short& nPhi)
{
Expand Down
24 changes: 0 additions & 24 deletions Detectors/TPC/spacecharge/src/SpaceCharge.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2464,8 +2464,6 @@ void SpaceCharge<DataT>::makeElectronDriftPathGif(const char* inpFile, TH2F& hDu
can.Print(Form("%s.gif++", outName));
}



template <typename DataT>
void SpaceCharge<DataT>::normalizeHistoQVEps0(TH3& histoIonsPhiRZ)
{
Expand Down Expand Up @@ -2658,10 +2656,6 @@ void SpaceCharge<DataT>::calcDistCorr(const DataT p1r, const DataT p1phi, const
ddPhi += ddPhiExB;
}





template <typename DataT>
template <typename DataTIn>
void SpaceCharge<DataT>::setGlobalDistortionsFromFile(TFile& inpf, const Side side)
Expand All @@ -2675,8 +2669,6 @@ void SpaceCharge<DataT>::setGlobalDistortionsFromFile(TFile& inpf, const Side si
mGlobalDistdRPhi[side].template initFromFile<DataTIn>(inpf, fmt::format("distRphi_side{}", sideName).data());
}



template <typename DataT>
template <typename DataTIn>
void SpaceCharge<DataT>::setGlobalCorrectionsFromFile(TFile& inpf, const Side side)
Expand All @@ -2690,15 +2682,6 @@ void SpaceCharge<DataT>::setGlobalCorrectionsFromFile(TFile& inpf, const Side si
mGlobalCorrdRPhi[side].template initFromFile<DataTIn>(inpf, fmt::format("corrRPhi_side{}", sideName).data());
}










template <typename DataT>
bool SpaceCharge<DataT>::checkGridFromFile(std::string_view file, std::string_view tree)
{
Expand All @@ -2719,7 +2702,6 @@ bool SpaceCharge<DataT>::checkGridFromFile(std::string_view file, std::string_vi
return true;
}


template <typename DataT>
int SpaceCharge<DataT>::dumpGlobalCorrections(TFile& outf, const Side side) const
{
Expand All @@ -2734,10 +2716,6 @@ int SpaceCharge<DataT>::dumpGlobalCorrections(TFile& outf, const Side side) cons
return er + ez + ephi;
}





template <typename DataT>
void SpaceCharge<DataT>::setSimNSector(const int nSectors)
{
Expand All @@ -2755,8 +2733,6 @@ void SpaceCharge<DataT>::unsetSimNSector()
o2::tpc::MGParameters::normalizeGridToNSector = SECTORSPERSIDE;
}



template <typename DataT>
void SpaceCharge<DataT>::initContainer(DataContainer& data, const bool initMem)
{
Expand Down
1 change: 0 additions & 1 deletion Detectors/TPC/spacecharge/src/SpaceChargeIO.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,6 @@ void SpaceCharge<DataT>::setFromFile(std::string_view file)
setFromFile(file, Side::C);
}


// explicit template instantiations of the moved members
template int o2::tpc::DataContainer3D<float>::writeToFile(std::string_view, std::string_view, std::string_view, const int) const;
template bool o2::tpc::DataContainer3D<float>::initFromFile(std::string_view, std::string_view, const int);
Expand Down