Skip to content

Commit 693e149

Browse files
author
Wiktor Pierozak
committed
Renamed FDD reco param strucutre
1 parent f853b73 commit 693e149

6 files changed

Lines changed: 11 additions & 14 deletions

File tree

DataFormats/Detectors/FIT/FDD/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ o2_add_library(DataFormatsFDD
1414
src/RecPoint.cxx
1515
src/CTF.cxx
1616
src/LookUpTable.cxx
17-
src/RecoFilterParam.cxx
17+
src/FDDRecoConfig.cxx
1818
PUBLIC_LINK_LIBRARIES O2::FDDBase
1919
O2::DataFormatsFIT
2020
O2::SimulationDataFormat
@@ -31,5 +31,5 @@ o2_target_root_dictionary(DataFormatsFDD
3131
include/DataFormatsFDD/RawEventData.h
3232
include/DataFormatsFDD/LookUpTable.h
3333
include/DataFormatsFDD/CTF.h
34-
include/DataFormatsFDD/RecoFilterParam.h)
34+
include/DataFormatsFDD/FDDRecoConfig.h)
3535

DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecoFilterParam.h renamed to DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515
#include "CommonUtils/ConfigurableParamHelper.h"
1616

1717
namespace o2::fdd {
18-
struct RecoChargeFilter: o2::conf::ConfigurableParamHelper<RecoChargeFilter>
18+
struct FDDRecoConfig: o2::conf::ConfigurableParamHelper<FDDRecoConfig>
1919
{
2020
double AmplitudeCutOnCollisionTimeWeights = 3;
21-
inline bool isAboveAmplitudeCut(double charge) const {
22-
return charge > AmplitudeCutOnCollisionTimeWeights;
23-
}
24-
O2ParamDef(RecoChargeFilter, "FDDRecoChargeFilter");
21+
O2ParamDef(FDDRecoConfig, "FDDRecoConfig");
2522
};
2623
}
2724
#endif

DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
#pragma link C++ class o2::fdd::CTF + ;
3838
#pragma link C++ class o2::ctf::EncodedBlocks < o2::fdd::CTFHeader, 8, uint32_t> + ;
3939

40-
#pragma link C++ class o2::fdd::RecoChargeFilter + ;
40+
#pragma link C++ struct o2::fdd::FDDRecoConfig + ;
4141

4242
#endif
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#include<DataFormatsFDD/FDDRecoConfig.h>
2+
3+
using namespace o2::fdd;
4+
O2ParamImpl(FDDRecoConfig);

DataFormats/Detectors/FIT/FDD/src/RecoFilterParam.cxx

Lines changed: 0 additions & 4 deletions
This file was deleted.

Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "FDDBase/Constants.h"
1818
#include <DataFormatsFDD/ChannelData.h>
1919
#include <DataFormatsFDD/Digit.h>
20-
#include <DataFormatsFDD/RecoFilterParam.h>
20+
#include <DataFormatsFDD/FDDRecoConfig.h>
2121
#include <fairlogger/Logger.h>
2222

2323
using namespace o2::fdd;
@@ -54,7 +54,7 @@ void Reconstructor::process(o2::fdd::Digit const& digitBC, gsl::span<const o2::f
5454
continue;
5555
}
5656
Float_t timeErr = 1;
57-
if (RecoChargeFilter::Instance().isAboveAmplitudeCut(adc)) {
57+
if (adc > FDDRecoConfig::Instance().AmplitudeCutOnCollisionTimeWeights) {
5858
timeErr = 1. / adc;
5959
}
6060
if ((int)inChData[ich].mPMNumber < 8) {

0 commit comments

Comments
 (0)