Skip to content

Commit 0ee05c5

Browse files
PhmonskiPhmonski
committed
clang-format corrections for PR
1 parent e653379 commit 0ee05c5

File tree

11 files changed

+342
-347
lines changed

11 files changed

+342
-347
lines changed

‎roofit/hs3/inc/RooFitHS3/RooJSONFactoryWSTool.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class RooJSONFactoryWSTool {
4141
static bool allowExportInvalidNames;
4242
static bool allowSanitizeNames;
4343
static RooWorkspace sanitizeWS(const RooWorkspace &ws);
44-
static RooWorkspace cleanWS(const RooWorkspace& ws, bool onlyModelConfig = false);
44+
static RooWorkspace cleanWS(const RooWorkspace &ws, bool onlyModelConfig = false);
4545

4646
struct CombinedData {
4747
std::string name;
@@ -56,7 +56,7 @@ class RooJSONFactoryWSTool {
5656
static bool isValidName(const std::string &str);
5757
static bool testValidName(const std::string &str, bool forcError);
5858
static std::string sanitizeName(const std::string str);
59-
static void rebuildModelConfigInWorkspace(RooStats::ModelConfig* mc, RooWorkspace& ws);
59+
static void rebuildModelConfigInWorkspace(RooStats::ModelConfig *mc, RooWorkspace &ws);
6060

6161
static RooFit::Detail::JSONNode &appendNamedChild(RooFit::Detail::JSONNode &node, std::string const &name);
6262
static RooFit::Detail::JSONNode const *findNamedChild(RooFit::Detail::JSONNode const &node, std::string const &name);
@@ -233,10 +233,10 @@ class RooJSONFactoryWSTool {
233233
void exportVariables(const RooArgSet &allElems, RooFit::Detail::JSONNode &n);
234234

235235
void exportAllObjects(RooFit::Detail::JSONNode &n);
236-
236+
237237
void exportModelConfig(RooFit::Detail::JSONNode &rootnode, RooStats::ModelConfig const &mc,
238238
const std::vector<RooJSONFactoryWSTool::CombinedData> &combined,
239-
const std::vector<RooAbsData*> &single);
239+
const std::vector<RooAbsData *> &single);
240240

241241
void exportSingleModelConfig(RooFit::Detail::JSONNode &rootnode, RooStats::ModelConfig const &mc,
242242
std::string const &analysisName,

‎roofit/hs3/src/JSONFactories_RooFitCore.cxx‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ class RooAddPdfFactory : public RooFit::JSONIO::Importer {
136136
bool importArg(RooJSONFactoryWSTool *tool, const JSONNode &p) const override
137137
{
138138
std::string name(RooJSONFactoryWSTool::name(p));
139-
if (!tool->requestArgList<RooAbsReal>(p, "coefficients").empty()){
139+
if (!tool->requestArgList<RooAbsReal>(p, "coefficients").empty()) {
140140
tool->wsEmplace<RooAddPdf>(name, tool->requestArgList<RooAbsPdf>(p, "summands"),
141-
tool->requestArgList<RooAbsReal>(p, "coefficients"));
141+
tool->requestArgList<RooAbsReal>(p, "coefficients"));
142142
return true;
143143
}
144144
tool->wsEmplace<RooAddPdf>(name, tool->requestArgList<RooAbsPdf>(p, "summands"));
@@ -152,7 +152,7 @@ class RooAddModelFactory : public RooFit::JSONIO::Importer {
152152
{
153153
std::string name(RooJSONFactoryWSTool::name(p));
154154
tool->wsEmplace<RooAddModel>(name, tool->requestArgList<RooAbsPdf>(p, "summands"),
155-
tool->requestArgList<RooAbsReal>(p, "coefficients"));
155+
tool->requestArgList<RooAbsReal>(p, "coefficients"));
156156
return true;
157157
}
158158
};
@@ -264,15 +264,14 @@ class RooPoissonFactory : public RooFit::JSONIO::Importer {
264264
}
265265
};
266266

267-
268267
class RooDecayFactory : public RooFit::JSONIO::Importer {
269268
public:
270269
bool importArg(RooJSONFactoryWSTool *tool, const JSONNode &p) const override
271270
{
272271
std::string name(RooJSONFactoryWSTool::name(p));
273272
RooRealVar *t = tool->requestArg<RooRealVar>(p, "t");
274273
RooAbsReal *tau = tool->requestArg<RooAbsReal>(p, "tau");
275-
RooResolutionModel *model = dynamic_cast<RooResolutionModel*>(tool->requestArg<RooAbsPdf>(p, "resolutionModel"));
274+
RooResolutionModel *model = dynamic_cast<RooResolutionModel *>(tool->requestArg<RooAbsPdf>(p, "resolutionModel"));
276275
RooDecay::DecayType decayType = static_cast<RooDecay::DecayType>(p["decayType"].val_int());
277276
tool->wsEmplace<RooDecay>(name, *t, *tau, *model, decayType);
278277
return true;
@@ -290,7 +289,6 @@ class RooTruthModelFactory : public RooFit::JSONIO::Importer {
290289
}
291290
};
292291

293-
294292
class RooGaussModelFactory : public RooFit::JSONIO::Importer {
295293
public:
296294
bool importArg(RooJSONFactoryWSTool *tool, const JSONNode &p) const override
@@ -349,7 +347,6 @@ class RooDerivativeFactory : public RooFit::JSONIO::Importer {
349347
}
350348
};
351349

352-
353350
class RooFFTConvPdfFactory : public RooFit::JSONIO::Importer {
354351
public:
355352
bool importArg(RooJSONFactoryWSTool *tool, const JSONNode &p) const override
@@ -360,7 +357,7 @@ class RooFFTConvPdfFactory : public RooFit::JSONIO::Importer {
360357
RooAbsPdf *pdf1 = tool->requestArg<RooAbsPdf>(p, "pdf1");
361358
RooAbsPdf *pdf2 = tool->requestArg<RooAbsPdf>(p, "pdf2");
362359
if (p.has_child("conv_func")) {
363-
RooAbsReal* convFunc = tool->requestArg<RooAbsReal>(p, "conv_func");
360+
RooAbsReal *convFunc = tool->requestArg<RooAbsReal>(p, "conv_func");
364361
tool->wsEmplace<RooFFTConvPdf>(name, *convFunc, *convVar, *pdf1, *pdf2, order);
365362
return true;
366363
}
@@ -775,7 +772,7 @@ class RooDecayStreamer : public RooFit::JSONIO::Exporter {
775772
elem["tau"] << pdf->getTau().GetName();
776773
elem["resolutionModel"] << pdf->getModel().GetName();
777774
elem["decayType"] << pdf->getDecayType();
778-
775+
779776
return true;
780777
}
781778
};
@@ -788,10 +785,10 @@ class RooTruthModelStreamer : public RooFit::JSONIO::Exporter {
788785
auto *pdf = static_cast<const RooTruthModel *>(func);
789786
elem["type"] << key();
790787
std::string name = elem["name"].val();
791-
//elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
788+
// elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
792789
elem["name"] << name;
793790
elem["x"] << pdf->convVar().GetName();
794-
791+
795792
return true;
796793
}
797794
};
@@ -804,7 +801,7 @@ class RooGaussModelStreamer : public RooFit::JSONIO::Exporter {
804801
auto *pdf = static_cast<const RooGaussModel *>(func);
805802
elem["type"] << key();
806803
std::string name = elem["name"].val();
807-
//elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
804+
// elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
808805
elem["name"] << name;
809806
elem["x"] << pdf->convVar().GetName();
810807
elem["mean"] << pdf->getMean().GetName();
@@ -917,12 +914,12 @@ class RooRealIntegralStreamer : public RooFit::JSONIO::Exporter {
917914
{
918915
auto *integral = static_cast<const RooRealIntegral *>(func);
919916
std::string name = elem["name"].val();
920-
//elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
917+
// elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
921918
elem["name"] << name;
922919

923920
elem["type"] << key();
924921
std::string integrand = integral->integrand().GetName();
925-
//elem["integrand"] << RooJSONFactoryWSTool::sanitizeName(integrand);
922+
// elem["integrand"] << RooJSONFactoryWSTool::sanitizeName(integrand);
926923
elem["integrand"] << integrand;
927924
if (integral->intRange()) {
928925
elem["domain"] << integral->intRange();
@@ -1062,7 +1059,7 @@ STATIC_EXECUTE([]() {
10621059
registerExporter<RooTFnBindingStreamer>(RooTFnBinding::Class(), false);
10631060
registerExporter<RooRealIntegralStreamer>(RooRealIntegral::Class(), false);
10641061
registerExporter<RooDerivativeStreamer>(RooDerivative::Class(), false);
1065-
registerExporter<RooFFTConvPdfStreamer>(RooFFTConvPdf::Class(), false);
1062+
registerExporter<RooFFTConvPdfStreamer>(RooFFTConvPdf::Class(), false);
10661063
registerExporter<RooExtendPdfStreamer>(RooExtendPdf::Class(), false);
10671064
});
10681065

0 commit comments

Comments
 (0)