From a5c1d100911fac96cd7d9d83813cdeedab9b6b59 Mon Sep 17 00:00:00 2001 From: Jerry Ling Date: Thu, 18 Aug 2022 13:29:10 -0400 Subject: [PATCH] modify rntuple stl test file to be more informative (#82) --- dev/make-root/rntuple_stl_containers.C | 12 ++++++------ .../data/test_ntuple_stl_containers.root | Bin 3311 -> 3444 bytes 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/make-root/rntuple_stl_containers.C b/dev/make-root/rntuple_stl_containers.C index 7da38f9..4b2fb37 100644 --- a/dev/make-root/rntuple_stl_containers.C +++ b/dev/make-root/rntuple_stl_containers.C @@ -25,8 +25,8 @@ void rntuple_stl_containers() { auto vector_vector_int32 = model->MakeField>>("vector_vector_int32"); auto vector_string = model->MakeField>("vector_string"); auto vector_vector_string = model->MakeField>>("vector_vector_string"); - auto variant_int32_float = model->MakeField>("variant_int32_float"); - auto vector_variant_int32_float = model->MakeField>>("vector_variant_int32_float"); + auto variant_int32_string = model->MakeField>("variant_int32_string"); + auto vector_variant_int64_string = model->MakeField>>("vector_variant_int64_string"); auto tuple_int32_string = model->MakeField>("tuple_int32_string"); auto vector_tuple_int32_string = model->MakeField>>("vector_tuple_int32_string"); @@ -40,8 +40,8 @@ void rntuple_stl_containers() { vector_string->emplace_back("one"); vector_vector_int32->emplace_back(std::vector{ 1 }); vector_vector_string->emplace_back(std::vector{ "one" }); - *variant_int32_float = 1.0f; - vector_variant_int32_float->emplace_back(1); + *variant_int32_string = 1; + vector_variant_int64_string->emplace_back("one"); *tuple_int32_string = std::tuple({1, "one"}); vector_tuple_int32_string->emplace_back(std::tuple({1, "one"})); @@ -52,8 +52,8 @@ void rntuple_stl_containers() { vector_string->emplace_back("two"); vector_vector_int32->emplace_back(std::vector{ 2 }); vector_vector_string->emplace_back(std::vector{ "two" }); - *variant_int32_float = 2.0f; - vector_variant_int32_float->emplace_back(2.0f); + *variant_int32_string = "two"; + vector_variant_int64_string->emplace_back(2); *tuple_int32_string = std::tuple({2, "two"}); vector_tuple_int32_string->emplace_back(std::tuple({2, "two"})); diff --git a/src/skhep_testdata/data/test_ntuple_stl_containers.root b/src/skhep_testdata/data/test_ntuple_stl_containers.root index f26726e61072f90d9a5cf1847b58af4ff4132b96..88504d1ff2d39b7addcb0af674a04967e5d0f6cd 100644 GIT binary patch delta 1746 zcmZuyeP~-%6#w1(KJxPUlBQX@hU7(;)h(M%leLBU(Z->p-E~Xp5h-F#KZR=tdDnI~1JLe^f-B12^XOJonW#Y3n8D-gnOV zopbN|o%3#fUw@_g&cQ-q2)ObafW3g1p1rm7d_M^z*(1|B4!B2Yohhapi&@!y1Y|{5 zK5@WX9DFoNi+Ci{^CE(TGKt}`z>4XZhtG)sZAPF>KMVUNIA%2TUi(yey5*xwW&=yI zXU%SQcU|&yu=mw-Ns50YGIIqFjIt!K@!~(-C!jW01z1YxL-wR{g z7vSyzY-y|?fHIGo$3-T`0=ut*4swV)&!IBW2Nr=o2fZdQyxJVrt)GLh2eI@S==XIHnL2Qy|%nZXV(}=#xCEoq*vwfmpraxxoTj z4u+nCnrf`iK{9mzlBwb}g;wMcC|2FHtQftPe=|byPBSe%xIf~JBjU>VrzDV zZx=lwoil%s47aHGl77{6%h8f9$IXCJ=9k;eE_p+le`J;a9rKh@?w?oQ8RLD*>LlJbevEmGC#a@f#tfz&mXP|uqaY8lh2W$sXo z9k))p2JhHjo|G@`E#|ezoT%}=%WODaD~~MXd+GPTaUYg&=AUw?R1(McE4xN>uIw5u zy|QFlCv`z2SZg!mDY2}*{9oxxrP4kwZ3-+M&Ss3+(Q-#w^rdp>&Uz*>bjV2ld}P<> zumAPqWe1}U|Kz%5iSm6$tN6^mv-~(I*wRS;kO)yT&Jtq?sxq3ZWhCf+YJ<^|fZsSw zQ*&G)o6k6!fM-lJ%_Az>NdH^-9@YdNce8?rJpFQlZj7%)Wcwntpi@R_L}?@2*#vDz zx8@Dg{PQyoa@GxY34UBze>|}F>P*T9?D>J zE)wE^W0BHKIX-;Md!jvI?k}o_P!EdF26b93{`&ntHn2N-xX>V z^f0_2t_JgrGm#|j;32MLC(ufHF24QTR?0JC=ef(y(?kJqy=2b2Hknyh)H^Bu2?#^O xl`)@jMeH8A$3|J^8?FXhFGX#$^{nu_N8k6k-({r$Z!HDf;Ut%LXt-e<{{nRoIZ6Nk delta 1629 zcmZ`(ZERCj7=F&V_x9d?thXQQ+O4#=kvg@4r42JOa2;m4DH!Gl8S3WjHjIO@v1JQ` z2qW>AS%NHQegxyhn5dZShhdngiApkJ(2)4UATb#6hyPd_$OUr)fE6kfTuuqipCF-F|q-b`gy=rr2eD1%)N8%s(S&nioVgt z(3QD~o)~p+s+<~7XPSL_r?1XrZ zotWvNO@rEpU7BnsQ0wtWzI7&zvBLAb`LkN zz)atbEL2~{3#N0W0j;FwejZZ#V1CRSquFiTd>5vb$wIR-9ZXFjO?AY*M!YQC~Nr{{3V$4wBXXYoX(aHY5-YcOx3ix8f)jSTBcoOA&9BC2Kt@~@v;mDIpL)zmHjEu>P zkE1zi+R17oXDNg5qph~0k+PzWGZbCHKr<+CKuCa&1;=Z&cHJx)qKo>E?QWW&L4FNz-Bh)Ax4?r>eJk`&b-KcR$&)4McFi8 zA}arJN|jFDHw$a?5^bs*GNW{hu>>WiHGY1IY!!a5O41@o8F-5w9VUU^R^KHE-v13Jy`d? z{2`N{KIft+xT5wI*kVT<5+QesJuf5f6o=h6uSvTdQ#>u)@3At-bBaKBIB5e<;Xung F{sDnkFtPvu