hs3: export polynomial defaults as numbers

Author: Phmonski

roofit/hs3/src/JSONFactories_RooFitCore.cxx

@@ -282,9 +282,9 @@ class RooPolynomialFactory : public RooFit::JSONIO::Importer {
          // As long as the coefficients match the default coefficients in
          // RooFit, we don't have to instantiate RooFit objects but can
          // increase the lowestOrder flag.
-         if (order == 0 && coef.val() == "1.0") {
+         if (order == 0 && (coef.val() == "1.0" || coef.val() == "1")) {
             ++lowestOrder;
-         } else if (coefs.empty() && coef.val() == "0.0") {
+         } else if (coefs.empty() && (coef.val() == "0.0" || coef.val() == "0")) {
             ++lowestOrder;
          } else {
             coefs.add(*tool->request<RooAbsReal>(coef.val(), name));
@@ -817,7 +817,7 @@ void writePolynomialBody(const Pdf *pdf, JSONNode &elem)
    elem["x"] << pdf->x().GetName();
    auto &coefs = elem["coefficients"].set_seq();
    for (int i = 0; i < pdf->lowestOrder(); ++i) {
-      coefs.append_child() << (i == 0 ? "1.0" : "0.0");
+      coefs.append_child() << (i == 0 ? 1.0 : 0.0);
    }
    for (const auto &coef : pdf->coefList()) {
       coefs.append_child() << coef->GetName();

roofit/hs3/test/testRooFitHS3.cxx

@@ -701,6 +701,12 @@ TEST(RooFitHS3, RooPolynomial)
    EXPECT_EQ(status, 0);
    status = validate({"Polynomial::poly1(x[0, 10], {a_2[0.003, -10, 10]}, 2)"});
    EXPECT_EQ(status, 0);
+
+   RooWorkspace ws;
+   ws.factory("Polynomial::poly1(x[0, 10], {a_2[0.003, -10, 10]}, 2)");
+   const std::string json = RooJSONFactoryWSTool{ws}.exportJSONtoString();
+   EXPECT_NE(json.find("\"coefficients\":[1.0,0.0,\"a_2\"]"), std::string::npos) << json;
+   EXPECT_EQ(json.find("\"coefficients\":[\"1.0\""), std::string::npos) << json;
 }
 
 TEST(RooFitHS3, RooPowerSum)