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

Jump to bottom

PPS Alignment - bug fix #34844

Merged
merged 5 commits into from
Aug 13, 2021
Merged

PPS Alignment - bug fix #34844

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d26234e
Registered PPSAlignmentConfig.
MatiXOfficial Aug 11, 2021
9c2363e
Moved typelookup to another file.
MatiXOfficial Aug 11, 2021
7ecf5ee
Added PPSAlignmentConfig to the utility tools.
MatiXOfficial Aug 12, 2021
2d03e69
Added serialization test for PPSAlignmentConfig.
MatiXOfficial Aug 12, 2021
f2d90ce
Added modules testing writing and retrieving PPSAlignmentConfig.
MatiXOfficial Aug 12, 2021
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
3 changes: 3 additions & 0 deletions CondCore/CTPPSPlugins/src/plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#include "CondFormats/DataRecord/interface/PPSDirectSimulationDataRcd.h"
#include "CondFormats/PPSObjects/interface/PPSPixelTopology.h"
#include "CondFormats/DataRecord/interface/PPSPixelTopologyRcd.h"
#include "CondFormats/PPSObjects/interface/PPSAlignmentConfig.h"
#include "CondFormats/DataRecord/interface/PPSAlignmentConfigRcd.h"

REGISTER_PLUGIN(CTPPSBeamParametersRcd, CTPPSBeamParameters);
REGISTER_PLUGIN(CTPPSPixelDAQMappingRcd, CTPPSPixelDAQMapping);
Expand All @@ -31,3 +33,4 @@ REGISTER_PLUGIN(PPSTimingCalibrationRcd, PPSTimingCalibration);
REGISTER_PLUGIN(CTPPSOpticsRcd, LHCOpticalFunctionsSetCollection);
REGISTER_PLUGIN(PPSDirectSimulationDataRcd, PPSDirectSimulationData);
REGISTER_PLUGIN(PPSPixelTopologyRcd, PPSPixelTopology);
REGISTER_PLUGIN(PPSAlignmentConfigRcd, PPSAlignmentConfig);
2 changes: 2 additions & 0 deletions CondFormats/PPSObjects/interface/PPSAlignmentConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ struct Binning {

unsigned int n_bins_y_;
double y_min_, y_max_;

COND_SERIALIZABLE;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ggovi usually it is not allowed to change the a class in CondFormat, but this is a bugfix, is it ok?

};
std::ostream &operator<<(std::ostream &os, Binning &b);

Expand Down
3 changes: 0 additions & 3 deletions CondFormats/PPSObjects/src/PPSAlignmentConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
*
****************************************************************************/

#include "FWCore/Utilities/interface/typelookup.h"

#include "CondFormats/PPSObjects/interface/PPSAlignmentConfig.h"
TYPELOOKUP_DATA_REG(PPSAlignmentConfig);

#include <iostream>
#include <cmath>
Expand Down
4 changes: 4 additions & 0 deletions CondFormats/PPSObjects/src/T_EventSetup_PPSAlignmentConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "CondFormats/PPSObjects/interface/PPSAlignmentConfig.h"
#include "FWCore/Utilities/interface/typelookup.h"

TYPELOOKUP_DATA_REG(PPSAlignmentConfig);
15 changes: 14 additions & 1 deletion CondFormats/PPSObjects/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,17 @@
<class name="LHCInterpolatedOpticalFunctionsSetCollection"/>

<class name="PPSDirectSimulationData" class_version="0"/>
</lcgdict>

<class name="PointErrors"/>
<class name="SelectionRange"/>
<class name="RPConfig"/>
<class name="SectorConfig"/>
<class name="Binning"/>
<class name="std::vector<PointErrors>"/>
<class name="std::map<unsigned int, std::vector<PointErrors>>"/>
<class name="std::pair<unsigned int, std::vector<PointErrors>>"/>
<class name="std::map<unsigned int, SelectionRange>"/>
<class name="std::pair<unsigned int, SelectionRange>"/>
<class name="PPSAlignmentConfig" class_version="0"/>

</lcgdict>
2 changes: 2 additions & 0 deletions CondFormats/PPSObjects/src/headers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@

#include "CondFormats/PPSObjects/interface/PPSDirectSimulationData.h"
#include "CondFormats/PPSObjects/interface/PPSPixelTopology.h"

#include "CondFormats/PPSObjects/interface/PPSAlignmentConfig.h"