@@ -92,7 +92,8 @@ void UnifiedParticleTransformerAK4ONNXJetTagsProducer::fillDescriptions(edm::Con
9292 desc.add <edm::InputTag>(" src" , edm::InputTag (" pfUnifiedParticleTransformerAK4TagInfos" ));
9393 desc.add <std::vector<std::string>>(
9494 " input_names" , {" input_1" , " input_2" , " input_3" , " input_4" , " input_5" , " input_6" , " input_7" , " input_8" });
95- desc.add <edm::FileInPath>(" model_path" , edm::FileInPath (" RecoBTag/Combined/data/UParTAK4/PUPPI/V1/UParTAK4_v2.onnx" ));
95+ desc.add <edm::FileInPath>(" model_path" ,
96+ edm::FileInPath (" RecoBTag/Combined/data/UParTAK4/PUPPI/V01/UParTAK4_v2.onnx" ));
9697 desc.add <std::vector<std::string>>(" output_names" , {" softmax" });
9798 desc.add <std::vector<std::string>>(
9899 " flav_names" ,
@@ -168,21 +169,11 @@ void UnifiedParticleTransformerAK4ONNXJetTagsProducer::get_input_sizes(
168169 const auto & features = taginfo.features ();
169170
170171 if (use_dynamic_axes_) {
171- unsigned int n_cpf = features.c_pf_features .size ();
172- unsigned int n_lt = features.lt_features .size ();
173- unsigned int n_npf = features.n_pf_features .size ();
174- unsigned int n_vtx = features.sv_features .size ();
175-
176172 // Use actual sizes for dynamic axes version
177- n_cpf_ = std::max ((unsigned int )1 , n_cpf);
178- n_lt_ = std::max ((unsigned int )1 , n_lt);
179- n_npf_ = std::max ((unsigned int )1 , n_npf);
180- n_sv_ = std::max ((unsigned int )1 , n_vtx);
181-
182- n_cpf_ = std::min ((unsigned int )29 , n_cpf_);
183- n_lt_ = std::min ((unsigned int )5 , n_lt_);
184- n_npf_ = std::min ((unsigned int )25 , n_npf_);
185- n_sv_ = std::min ((unsigned int )5 , n_sv_);
173+ n_cpf_ = std::clamp ((unsigned int )features.c_pf_features .size (), (unsigned int )1 , (unsigned int )29 );
174+ n_lt_ = std::clamp ((unsigned int )features.lt_features .size (), (unsigned int )1 , (unsigned int )5 );
175+ n_npf_ = std::clamp ((unsigned int )features.n_pf_features .size (), (unsigned int )1 , (unsigned int )25 );
176+ n_sv_ = std::clamp ((unsigned int )features.sv_features .size (), (unsigned int )1 , (unsigned int )5 );
186177
187178 } else {
188179 // Use fixed sizes for original version
0 commit comments