Skip to content
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

Iterative thresholds + DP correction #92

Open
wants to merge 21 commits into
base: rolling-calib-timing-calibration-14_1_4
Choose a base branch
from
Open

Iterative thresholds + DP correction #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
33c7454
PPS timing calibration automation, worker configuration
Dec 13, 2023
ab25dbd
Add automation harvester configuration
Dec 14, 2023
e47ba05
Harvester argument automatically adds file: for local files
Dec 15, 2023
6960c52
Update calibration fit
Jan 20, 2024
84d76f8
Update the limits of the calibration fit
Jan 20, 2024
1ff0ea7
CMSSW PR changes and threshold parameter parsing
Mar 13, 2024
f2c8b0f
Add LumiList filter from JSON for worker (#88)
tostafin Jul 15, 2024
7ffbc29
Merged rolling-calib-timing-calibration-14_1_4 from repository CTPPS …
Nov 8, 2024
f5fd481
Perform t vs TOT fitting in iterations
Nov 9, 2024
b551352
Add correction for leading edge double peak
Nov 9, 2024
57b6875
Cache DP correction results
Nov 14, 2024
ac35473
Separate fitting of two t projections for lower t differences
Nov 18, 2024
940ef1e
Remove relative includes
Nov 18, 2024
89a963b
Check for DP in sliding windows
Nov 19, 2024
6b992b9
Compute max ToT bin only once per channel
Dec 7, 2024
09e0bb6
Increase sliiding window size to 5
Dec 7, 2024
063c2fd
Encode LS and TO with the same abs value
Dec 11, 2024
3fca71a
Correct DP in RecHit algorithm
Dec 11, 2024
5f73217
Correct DP only from Run 3 onwards
Dec 13, 2024
a6cc2a9
Change DP-corrected leading time function
Dec 17, 2024
0813d12
Don't correct missing leading edges
Jan 4, 2025
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
6 changes: 6 additions & 0 deletions CalibPPS/TimingCalibration/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<use name="DataFormats/CTPPSDetId"/>
<use name="FWCore/Utilities"/>
<use name="root"/>
<export>
<lib name="1"/>
</export>
34 changes: 34 additions & 0 deletions CalibPPS/TimingCalibration/interface/DoublePeakCorrection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#ifndef CalibPPS_TimingCalibration_DoublePeakCorrection_h
#define CalibPPS_TimingCalibration_DoublePeakCorrection_h

#include "CalibPPS/TimingCalibration/interface/PlaneMap.h"

#include "DataFormats/CTPPSDetId/interface/CTPPSDiamondDetId.h"

#include "TFile.h"
#include "TH2F.h"

#include <utility>

class DoublePeakCorrection {
public:
void extractLsAndTimeOffset(const std::string&, const unsigned int, const std::vector<CTPPSDiamondDetId>&);
void fillLsAndTimeOffset(const TH2F*, const PlaneKey&);
bool isCorrectionNeeded(const PlaneKey&) const;
double getCorrectedLeadingTime(const double, const unsigned int, const PlaneKey&) const;
double getEncodedLsAndTimeOffset(const PlaneKey&) const;

static double GetCorrectedLeadingTime(const double, const unsigned int, const double);

private:
const TH2F* getTVsLs(TFile&, const std::string&, const CTPPSDiamondDetId&);
std::tuple<unsigned int, double, double> findLsAndTimePeaks(const TH2F*, const PlaneKey&) const;
double findTimeOffset(const TH2F*, const unsigned int, const double, const double) const;
double findGaussianMean(const std::unique_ptr<TH1D>&, const double) const;

std::unordered_map<PlaneKey, std::pair<unsigned int, double>, PlaneKeyHash> lsAndTimeOffsets_;

constexpr static unsigned int LsEncodingMultiple_{100};
};

#endif
17 changes: 17 additions & 0 deletions CalibPPS/TimingCalibration/interface/PlaneMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#ifndef CalibPPS_TimingCalibration_PlaneMap_h
#define CalibPPS_TimingCalibration_PlaneMap_h

#include <cstdint>
#include <functional>
#include <tuple>

using PlaneKey = std::tuple<uint32_t, uint32_t, uint32_t>;

struct PlaneKeyHash {
std::size_t operator()(const PlaneKey& planeKey) const noexcept {
return std::hash<uint32_t>()(std::get<0>(planeKey)) ^ std::hash<uint32_t>()(std::get<1>(planeKey)) ^
std::hash<uint32_t>()(std::get<2>(planeKey));
}
};

#endif
21 changes: 21 additions & 0 deletions CalibPPS/TimingCalibration/interface/TimingCalibrationData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#ifndef CalibPPS_TimingCalibration_TimingCalibrationData_h
#define CalibPPS_TimingCalibration_TimingCalibrationData_h

#include "CalibPPS/TimingCalibration/interface/DoublePeakCorrection.h"
#include "CalibPPS/TimingCalibration/interface/PlaneMap.h"

#include "DQMServices/Core/interface/MonitorElement.h"

struct TimingCalibrationData {
using PlaneMonitorMap = std::unordered_map<PlaneKey, dqm::reco::MonitorElement*, PlaneKeyHash>;
using ChannelMonitorMap = std::unordered_map<uint32_t, dqm::reco::MonitorElement*>;

ChannelMonitorMap leadingTime;
ChannelMonitorMap toT;
ChannelMonitorMap leadingTimeVsToT;
PlaneMonitorMap leadingTimeVsLs;

DoublePeakCorrection doublePeakCorrection;
};

#endif
17 changes: 0 additions & 17 deletions CalibPPS/TimingCalibration/interface/TimingCalibrationStruct.h
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions CalibPPS/TimingCalibration/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<library name="CalibPPSTimingCalibrationPlugins" file="*.cc">
<flags EDM_PLUGIN="1"/>
<use name="DQMServices/Core"/>
<use name="FWCore/ServiceRegistry"/>
<use name="CalibPPS/TimingCalibration"/>
<use name="CondCore/DBOutputService"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/PPSObjects"/>
<use name="DQMServices/Core"/>
<use name="FWCore/ServiceRegistry"/>
<use name="Geometry/Records"/>
<use name="Geometry/VeryForwardGeometryBuilder"/>
<use name="CondFormats/DataRecord"/>
</library>
1 change: 0 additions & 1 deletion CalibPPS/TimingCalibration/plugins/PPSDiamondSampicTimingCalibrationPCLHarvester.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "Geometry/VeryForwardGeometryBuilder/interface/CTPPSGeometry.h"
#include "Geometry/Records/interface/VeryForwardRealGeometryRecord.h"

#include "CalibPPS/TimingCalibration/interface/TimingCalibrationStruct.h"
#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"

#include "DataFormats/CTPPSDetId/interface/CTPPSDiamondDetId.h"
Expand Down
Loading