Merge pull request #1601 from AndrewEdmonds11/trkqual-ann1-v2

brownd1978 · web-flow · commit c9496962189d · 2025-10-06T13:02:32.000-07:00
TrkQual ANN1 v2
diff --git a/TrkDiag/data/TrkQual_ANN1_v1.1.dat b/TrkDiag/data/TrkQual_ANN1_v1.1.dat
@@ -0,0 +1,16 @@
+tensor_dense3bias0 1
+0.178966671
+tensor_dense3kernel0 6
+1.20168364 1.43147528 2.39308214 -1.47834182 -1.77923989 -1.62132621
+tensor_dense2bias0 6
+0.27408427 0.361127704 0.527734339 -0.197335362 -0.277288616 -0.250326961
+tensor_dense2kernel0 42
+1.24248981 1.68657136 0.580629408 -1.29594588 -1.52601588 -1.34762144 -1.41932189 -0.64749372 -1.00847006 0.386347026 0.590376198 1.14625442 1.25400734 0.890556216 1.63937497 -1.32650363 -1.39576185 -0.760854185 -0.484269142 -0.219980687 -1.06341076 0.885286033 1.3210001 0.511840403 -1.01292121 -1.68742216 -1.37132204 1.2034663 0.800925195 0.560566783 0.669973969 0.841767192 1.36379969 -1.28470266 -0.669319689 -1.2420491 -0.676661491 -1.36753523 -1.081375 1.44165909 1.16387773 1.50106692
+tensor_dense1bias0 7
+-0.139500275 -0.0266349036 0.250138432 -0.474096775 -0.0043227002 0.00058805017 -0.419361025
+tensor_dense1kernel0 49
+1.33627844 -1.08804011 1.47262084 -1.54580998 -1.68976009 1.05805719 -1.12055814 1.23008454 -0.471503854 0.717503071 -1.02277601 -1.05777419 1.3466717 -1.2150625 -1.09453619 1.03351021 -1.0580169 1.74206591 1.69959366 -0.884019434 1.40520537 1.3184247 -1.99197423 1.74704146 -1.23650503 -1.27453685 1.48437679 -1.20843387 0.8351928 -0.682861269 0.937186122 -0.909166634 -1.50940955 1.59290111 -1.11426926 0.369700134 -0.645182908 -0.210700169 0.160646677 -0.0907614604 -0.208749071 0.0856463239 -1.103122 1.73795617 -0.925886631 0.496161044 0.496269315 -0.943492532 1.24332654
+tensor_densebias0 7
+-0.429622233 -0.604658067 0.521132469 -0.312717199 -0.461810499 -0.392835528 0.476350784
+tensor_densekernel0 49
+-0.00726429326 -0.00251825852 0.000687693246 0.0123903966 0.0155043583 0.133445725 -0.0113047678 0.85913378 -0.582245767 -0.613664627 0.924752831 0.350442708 0.165493369 -0.139606133 0.381944209 -0.347789913 0.309244007 0.0929005891 -0.591900408 -0.515794754 0.799169123 -1.83798695 -2.25321841 2.24064255 -2.57647204 -2.64294195 0.480600446 2.54768205 0.88557446 0.458795965 -0.538718402 0.996007383 0.419516593 -0.586616576 -0.307902664 -3.57222366 -2.69737005 3.02453923 -3.28388524 -2.99971819 -0.438756734 2.90387464 0.0481776521 -0.362881452 -0.0878590792 -0.824209332 -0.613852561 -0.326257765 0.156067431
diff --git a/TrkDiag/data/TrkQual_ANN1_v2.dat b/TrkDiag/data/TrkQual_ANN1_v2.dat
@@ -0,0 +1,16 @@
+tensor_dense3bias0 1
+0.186534837
+tensor_dense3kernel0 6
+1.81036329 -2.29417396 -1.50148273 -1.32043827 2.13679957 2.02433968
+tensor_dense2bias0 6
+-0.288381368 0.137570754 0.365000695 0.303222567 -0.165270135 -0.135272056
+tensor_dense2kernel0 42
+-1.9936682 1.59684598 1.65284026 0.877283096 -1.04642391 -1.12536287 1.6558845 -1.66566062 -0.731061816 -1.35263324 0.842080116 1.39430976 0.454730481 -1.23196113 -1.06990576 -0.725558996 1.12362492 0.746391594 1.62796164 -0.764996648 -1.54364848 -0.476767004 1.33555079 1.23750126 0.673419595 -0.876904249 -1.40396702 -1.61613607 0.808427751 1.58393896 1.62059975 -1.08411336 -1.58937335 -1.69307542 1.6120218 0.768331707 -1.0455302 0.89593786 1.4696666 1.40009415 -1.62354577 -1.70681262
+tensor_dense1bias0 7
+-0.189608842 0.49356401 0.299145371 0.172985286 0.480412155 0.28811869 -0.616587937
+tensor_dense1kernel0 49
+-1.58893955 1.44853806 0.732417822 1.77090371 1.60104001 1.43105078 -1.79879272 0.787856936 -0.676988363 -1.23295927 -0.620969176 -0.633426189 -0.656923354 1.25325453 1.1760149 -1.84740961 -1.13780153 -1.23290932 -1.55833137 -1.33127034 1.70087469 0.594606936 -1.04156625 -0.301720113 -0.676518023 -0.680781662 -0.766564786 0.681998432 1.29998004 -0.3144041 -0.628608584 -1.15575099 -0.297947526 -0.85817349 1.17424762 1.1868937 -0.87986356 -1.36341929 -1.12639391 -1.31573415 -1.12034667 0.202731714 -1.20129061 0.819378376 1.13643205 0.862402976 0.322605968 0.904999495 -0.913763702
+tensor_densebias0 7
+-0.566621602 0.701894641 0.399886638 0.619448483 0.193291575 0.269384533 -0.422419637
+tensor_densekernel0 49
+0.00445415871 -0.0375222079 0.00427953899 -0.0418638252 0.000945639855 -0.375873595 0.56310761 0.610171735 0.157107383 -1.05960321 -0.152684644 -0.775194645 -0.514385939 -0.277479917 -0.137682289 0.0293092951 0.0348482132 0.34652555 -0.317878515 1.1581372 -0.153227493 -1.91584063 1.83500528 0.503768384 2.04747009 0.184503421 -0.125619426 -0.246436402 0.194236279 -0.658132613 -0.622010887 -0.631466448 -1.13728333 0.645930588 0.488817275 -4.03062201 4.44671869 3.79064274 3.50110364 2.73582578 3.33001304 -3.99736428 0.00807900447 0.759751141 -0.0967001095 1.20479131 -0.218031242 0.697991908 -0.137175336
diff --git a/TrkDiag/src/TrackQuality_module.cc b/TrkDiag/src/TrackQuality_module.cc
@@ -36,6 +36,7 @@ using CLHEP::HepVector;
 namespace TMVA_SOFIE_TrkQual_ANN1 {
   class Session;
 }
+
 namespace mu2e
 {
 
@@ -151,7 +152,8 @@ namespace mu2e
         features[5] = -9999;
       }
 
-      auto mvaout = mva_->infer(features.data());
+      std::vector<float> mvaout = mva_->infer(features.data());
+
       if (!entrance_found) {
         mvaout[0] = 0; // this is not a good track
       }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ using CLHEP::HepVector;`
`36`	`36`	`namespace TMVA_SOFIE_TrkQual_ANN1 {`
`37`	`37`	`class Session;`
`38`	`38`	`}`
	`39`	`+`
`39`	`40`	`namespace mu2e`
`40`	`41`	`{`
`41`	`42`
`@@ -151,7 +152,8 @@ namespace mu2e`
`151`	`152`	`features[5] = -9999;`
`152`	`153`	`}`
`153`	`154`
`154`		`- auto mvaout = mva_->infer(features.data());`
	`155`	`+ std::vector<float> mvaout = mva_->infer(features.data());`
	`156`	`+`
`155`	`157`	`if (!entrance_found) {`
`156`	`158`	`mvaout[0] = 0; // this is not a good track`
`157`	`159`	`}`