diff --git a/sw/zdclg/sim-val/1111.root b/sw/zdclg/sim-val/1111.root new file mode 100644 index 0000000000000000000000000000000000000000..94dbd100e654e600fe5cfa0c4add7475abbeecb4 Binary files /dev/null and b/sw/zdclg/sim-val/1111.root differ diff --git a/sw/zdclg/sim-val/2nd_realpmttest3mm.csv b/sw/zdclg/sim-val/2nd_realpmttest3mm.csv new file mode 100644 index 0000000000000000000000000000000000000000..0ac19b445f55ddbed04f4a0c18d4f9f9d4161ce3 --- /dev/null +++ b/sw/zdclg/sim-val/2nd_realpmttest3mm.csv @@ -0,0 +1,361 @@ +0.0,0.0,8.647459983825684 +3.0,0.0,8.762482643127441 +6.0,0.0,10.82133674621582 +9.0,0.0,13.084964752197266 +12.0,0.0,13.469919204711914 +15.0,0.0,13.23572826385498 +18.0,0.0,13.618020057678223 +21.0,0.0,13.392853736877441 +24.0,0.0,13.592924118041992 +27.0,0.0,13.231407165527344 +30.0,0.0,13.305336952209473 +33.0,0.0,11.781105995178223 +36.0,0.0,11.693548202514648 +39.0,0.0,10.520793914794922 +42.0,0.0,10.667548179626465 +45.0,0.0,9.912291526794434 +48.0,0.0,8.448633193969727 +51.0,0.0,6.365356922149658 +54.0,0.0,5.562281608581543 +54.0,3.0,6.651165962219238 +51.0,3.0,15.49500560760498 +48.0,3.0,33.162574768066406 +45.0,3.0,40.27717590332031 +42.0,3.0,45.0568962097168 +39.0,3.0,46.96311569213867 +36.0,3.0,53.73546600341797 +33.0,3.0,54.79887390136719 +30.0,3.0,60.72267532348633 +27.0,3.0,59.724464416503906 +24.0,3.0,62.504371643066406 +21.0,3.0,57.86509704589844 +18.0,3.0,57.27066421508789 +15.0,3.0,55.94599914550781 +12.0,3.0,53.69553756713867 +9.0,3.0,46.564823150634766 +6.0,3.0,29.87895393371582 +3.0,3.0,14.055718421936035 +0.0,3.0,8.656974792480469 +0.0,6.0,8.952130317687988 +3.0,6.0,22.478824615478516 +6.0,6.0,56.24474334716797 +9.0,6.0,95.18533325195312 +12.0,6.0,107.41968536376953 +15.0,6.0,113.72444915771484 +18.0,6.0,114.86724853515625 +21.0,6.0,122.77619934082031 +24.0,6.0,122.63933563232422 +27.0,6.0,124.40887451171875 +30.0,6.0,118.72857666015625 +33.0,6.0,119.04871368408203 +36.0,6.0,107.5960693359375 +39.0,6.0,101.95591735839844 +42.0,6.0,92.27538299560547 +45.0,6.0,89.41900634765625 +48.0,6.0,66.37671661376953 +51.0,6.0,35.61161804199219 +54.0,6.0,9.407437324523926 +54.0,9.0,11.509920120239258 +51.0,9.0,51.00246047973633 +48.0,9.0,94.75076293945312 +45.0,9.0,123.9842300415039 +42.0,9.0,135.0540008544922 +39.0,9.0,145.90342712402344 +36.0,9.0,151.94053649902344 +33.0,9.0,169.2866973876953 +30.0,9.0,166.18238830566406 +27.0,9.0,177.48858642578125 +24.0,9.0,168.5384979248047 +21.0,9.0,168.2475128173828 +18.0,9.0,157.2025909423828 +15.0,9.0,155.15750122070312 +12.0,9.0,148.8184051513672 +9.0,9.0,124.27225494384766 +6.0,9.0,72.09947967529297 +3.0,9.0,27.612794876098633 +0.0,9.0,9.118351936340332 +0.0,12.0,9.321939468383789 +3.0,12.0,28.91095542907715 +6.0,12.0,78.26428985595703 +9.0,12.0,138.22203063964844 +12.0,12.0,153.7700653076172 +15.0,12.0,166.38621520996094 +18.0,12.0,176.2089385986328 +21.0,12.0,180.56503295898438 +24.0,12.0,189.23719787597656 +27.0,12.0,184.9883575439453 +30.0,12.0,192.79173278808594 +33.0,12.0,174.78282165527344 +36.0,12.0,174.28163146972656 +39.0,12.0,156.85067749023438 +42.0,12.0,148.78402709960938 +45.0,12.0,133.10719299316406 +48.0,12.0,106.34957122802734 +51.0,12.0,54.693145751953125 +54.0,12.0,12.913236618041992 +54.0,15.0,12.002472877502441 +51.0,15.0,54.318904876708984 +48.0,15.0,112.6694564819336 +45.0,15.0,141.8318328857422 +42.0,15.0,156.20571899414062 +39.0,15.0,159.9170379638672 +36.0,15.0,179.73390197753906 +33.0,15.0,181.9404296875 +30.0,15.0,196.97048950195312 +27.0,15.0,194.1667022705078 +24.0,15.0,199.5745391845703 +21.0,15.0,192.52096557617188 +18.0,15.0,183.92222595214844 +15.0,15.0,174.3083953857422 +12.0,15.0,166.6411590576172 +9.0,15.0,139.1995849609375 +6.0,15.0,83.24823760986328 +3.0,15.0,33.94916534423828 +0.0,15.0,9.739215850830078 +0.0,18.0,9.79904556274414 +3.0,18.0,32.456974029541016 +6.0,18.0,90.39689636230469 +9.0,18.0,150.5200958251953 +12.0,18.0,175.24444580078125 +15.0,18.0,183.84841918945312 +18.0,18.0,192.48423767089844 +21.0,18.0,202.77455139160156 +24.0,18.0,200.78781127929688 +27.0,18.0,212.82786560058594 +30.0,18.0,198.66380310058594 +33.0,18.0,202.48085021972656 +36.0,18.0,178.8942108154297 +39.0,18.0,175.91871643066406 +42.0,18.0,156.7856903076172 +45.0,18.0,150.2910614013672 +48.0,18.0,113.13078308105469 +51.0,18.0,56.732513427734375 +54.0,18.0,13.521427154541016 +54.0,21.0,13.537446975708008 +51.0,21.0,63.708892822265625 +48.0,21.0,118.92404174804688 +45.0,21.0,165.50711059570312 +42.0,21.0,169.07008361816406 +39.0,21.0,184.3418426513672 +36.0,21.0,192.0458984375 +33.0,21.0,205.22027587890625 +30.0,21.0,211.9425811767578 +27.0,21.0,219.4115447998047 +24.0,21.0,218.1853485107422 +21.0,21.0,207.25961303710938 +18.0,21.0,206.5458221435547 +15.0,21.0,186.29226684570312 +12.0,21.0,189.7075653076172 +9.0,21.0,151.20750427246094 +6.0,21.0,92.55086517333984 +3.0,21.0,34.9373664855957 +0.0,21.0,9.968090057373047 +0.0,24.0,9.889708518981934 +3.0,24.0,34.60424041748047 +6.0,24.0,97.52547454833984 +9.0,24.0,158.81092834472656 +12.0,24.0,197.20703125 +15.0,24.0,193.5537109375 +18.0,24.0,213.9582061767578 +21.0,24.0,215.7589111328125 +24.0,24.0,228.9824981689453 +27.0,24.0,228.5962371826172 +30.0,24.0,221.62271118164062 +33.0,24.0,219.3737335205078 +36.0,24.0,195.36660766601562 +39.0,24.0,197.1924285888672 +42.0,24.0,174.77880859375 +45.0,24.0,172.4609832763672 +48.0,24.0,125.3281478881836 +51.0,24.0,66.64859008789062 +54.0,24.0,14.518220901489258 +54.0,27.0,13.261658668518066 +51.0,27.0,64.6761703491211 +48.0,27.0,129.87368774414062 +45.0,27.0,177.66880798339844 +42.0,27.0,178.76226806640625 +39.0,27.0,200.42840576171875 +36.0,27.0,206.71607971191406 +33.0,27.0,223.0957489013672 +30.0,27.0,229.6202850341797 +27.0,27.0,227.74461364746094 +24.0,27.0,234.33851623535156 +21.0,27.0,221.17013549804688 +18.0,27.0,220.51585388183594 +15.0,27.0,200.4512176513672 +12.0,27.0,202.0343780517578 +9.0,27.0,163.04774475097656 +6.0,27.0,101.00253295898438 +3.0,27.0,37.0954475402832 +0.0,27.0,9.533788681030273 +0.0,30.0,9.69227123260498 +3.0,30.0,37.21818161010742 +6.0,30.0,103.29840087890625 +9.0,30.0,166.68739318847656 +12.0,30.0,202.75140380859375 +15.0,30.0,201.00645446777344 +18.0,30.0,217.5581817626953 +21.0,30.0,222.19766235351562 +24.0,30.0,233.5227508544922 +27.0,30.0,236.6329345703125 +30.0,30.0,229.34423828125 +33.0,30.0,223.5919647216797 +36.0,30.0,205.5417938232422 +39.0,30.0,199.43960571289062 +42.0,30.0,179.21051025390625 +45.0,30.0,173.22645568847656 +48.0,30.0,127.07810974121094 +51.0,30.0,68.59916687011719 +54.0,30.0,13.579718589782715 +54.0,33.0,14.16440200805664 +51.0,33.0,68.26567077636719 +48.0,33.0,128.398681640625 +45.0,33.0,172.7333526611328 +42.0,33.0,175.53292846679688 +39.0,33.0,199.2113037109375 +36.0,33.0,202.02645874023438 +33.0,33.0,222.54454040527344 +30.0,33.0,222.5418243408203 +27.0,33.0,229.20025634765625 +24.0,33.0,229.21292114257812 +21.0,33.0,218.9058074951172 +18.0,33.0,217.05870056152344 +15.0,33.0,196.19017028808594 +12.0,33.0,196.8426513671875 +9.0,33.0,157.96795654296875 +6.0,33.0,92.402099609375 +3.0,33.0,35.67165756225586 +0.0,33.0,9.423698425292969 +0.0,36.0,9.75837230682373 +3.0,36.0,32.72297668457031 +6.0,36.0,94.54967498779297 +9.0,36.0,155.9432830810547 +12.0,36.0,184.4856719970703 +15.0,36.0,193.3460235595703 +18.0,36.0,199.60963439941406 +21.0,36.0,217.56561279296875 +24.0,36.0,213.71469116210938 +27.0,36.0,224.14718627929688 +30.0,36.0,210.58465576171875 +33.0,36.0,208.89886474609375 +36.0,36.0,198.8333740234375 +39.0,36.0,181.9639434814453 +42.0,36.0,176.54953002929688 +45.0,36.0,161.08172607421875 +48.0,36.0,128.36756896972656 +51.0,36.0,65.2641372680664 +54.0,36.0,13.912120819091797 +54.0,39.0,12.171809196472168 +51.0,39.0,58.615257263183594 +48.0,39.0,121.39016723632812 +45.0,39.0,150.8585205078125 +42.0,39.0,168.33277893066406 +39.0,39.0,174.4862823486328 +36.0,39.0,189.95928955078125 +33.0,39.0,200.44271850585938 +30.0,39.0,206.4382781982422 +27.0,39.0,215.2101593017578 +24.0,39.0,202.82470703125 +21.0,39.0,207.840576171875 +18.0,39.0,185.731201171875 +15.0,39.0,191.74832153320312 +12.0,39.0,171.82785034179688 +9.0,39.0,151.63705444335938 +6.0,39.0,88.72897338867188 +3.0,39.0,34.417537689208984 +0.0,39.0,10.187175750732422 +0.0,42.0,9.676271438598633 +3.0,42.0,33.46372985839844 +6.0,42.0,84.74654388427734 +9.0,42.0,149.88723754882812 +12.0,42.0,169.16256713867188 +15.0,42.0,175.52545166015625 +18.0,42.0,189.075927734375 +21.0,42.0,192.03993225097656 +24.0,42.0,207.0579376220703 +27.0,42.0,196.75460815429688 +30.0,42.0,205.08383178710938 +33.0,42.0,186.4360809326172 +36.0,42.0,179.8756103515625 +39.0,42.0,166.4312744140625 +42.0,42.0,154.62994384765625 +45.0,42.0,145.68711853027344 +48.0,42.0,109.74071502685547 +51.0,42.0,57.698001861572266 +54.0,42.0,12.36036205291748 +54.0,45.0,12.14766788482666 +51.0,45.0,53.0810661315918 +48.0,45.0,104.12010955810547 +45.0,45.0,131.49681091308594 +42.0,45.0,143.19154357910156 +39.0,45.0,156.00921630859375 +36.0,45.0,160.85264587402344 +33.0,45.0,177.8394775390625 +30.0,45.0,175.36129760742188 +27.0,45.0,187.0041046142578 +24.0,45.0,175.8707733154297 +21.0,45.0,174.1671600341797 +18.0,45.0,168.45440673828125 +15.0,45.0,156.8399200439453 +12.0,45.0,154.4320068359375 +9.0,45.0,125.60100555419922 +6.0,45.0,79.52182006835938 +3.0,45.0,28.60618019104004 +0.0,45.0,9.601216316223145 +0.0,48.0,8.833477020263672 +3.0,48.0,18.28453254699707 +6.0,48.0,48.770118713378906 +9.0,48.0,78.7852783203125 +12.0,48.0,93.67229461669922 +15.0,48.0,98.60157775878906 +18.0,48.0,102.9288330078125 +21.0,48.0,112.56462097167969 +24.0,48.0,111.27764892578125 +27.0,48.0,117.4419174194336 +30.0,48.0,112.56742858886719 +33.0,48.0,111.6639404296875 +36.0,48.0,106.09647369384766 +39.0,48.0,98.1689224243164 +42.0,48.0,93.83467102050781 +45.0,48.0,84.66289520263672 +48.0,48.0,67.89991760253906 +51.0,48.0,37.37594985961914 +54.0,48.0,10.015195846557617 +54.0,51.0,6.921557903289795 +51.0,51.0,16.332714080810547 +48.0,51.0,31.083528518676758 +45.0,51.0,37.505104064941406 +42.0,51.0,39.31639099121094 +39.0,51.0,41.837013244628906 +36.0,51.0,44.62148666381836 +33.0,51.0,48.10224151611328 +30.0,51.0,46.353515625 +27.0,51.0,50.581478118896484 +24.0,51.0,46.68996047973633 +21.0,51.0,45.675086975097656 +18.0,51.0,41.866554260253906 +15.0,51.0,40.72868347167969 +12.0,51.0,37.533809661865234 +9.0,51.0,33.30044174194336 +6.0,51.0,21.558923721313477 +3.0,51.0,10.505146026611328 +0.0,51.0,8.23129653930664 +0.0,54.0,8.706299781799316 +3.0,54.0,8.593215942382812 +6.0,54.0,9.121186256408691 +9.0,54.0,10.647336959838867 +12.0,54.0,11.509557723999023 +15.0,54.0,13.325568199157715 +18.0,54.0,14.363637924194336 +21.0,54.0,15.544934272766113 +24.0,54.0,14.935005187988281 +27.0,54.0,14.759085655212402 +30.0,54.0,13.151949882507324 +33.0,54.0,11.489065170288086 +36.0,54.0,10.298110008239746 +39.0,54.0,10.105034828186035 +42.0,54.0,9.415196418762207 +45.0,54.0,9.687979698181152 +48.0,54.0,7.810864448547363 +51.0,54.0,6.6751556396484375 +54.0,54.0,5.7077789306640625 diff --git a/sw/zdclg/sim-val/56-trap-redo-csv.root b/sw/zdclg/sim-val/56-trap-redo-csv.root new file mode 100644 index 0000000000000000000000000000000000000000..e72a85845cc21ce601918e980de42979228d314e Binary files /dev/null and b/sw/zdclg/sim-val/56-trap-redo-csv.root differ diff --git a/sw/zdclg/sim-val/BOX50x50x56trapSimVal.csv b/sw/zdclg/sim-val/BOX50x50x56trapSimVal.csv new file mode 100644 index 0000000000000000000000000000000000000000..f77c22b1db81b4c786efa2f2ef57fbfaa40690ee --- /dev/null +++ b/sw/zdclg/sim-val/BOX50x50x56trapSimVal.csv @@ -0,0 +1,306 @@ +0.0,0.0,10.795670509338379 +3.0,0.0,14.764391899108887 +6.0,0.0,19.758140563964844 +9.0,0.0,26.522573471069336 +12.0,0.0,29.161880493164062 +15.0,0.0,29.59050178527832 +18.0,0.0,32.396583557128906 +21.0,0.0,31.463054656982422 +24.0,0.0,33.166412353515625 +27.0,0.0,35.167396545410156 +30.0,0.0,36.18916702270508 +33.0,0.0,34.60369873046875 +36.0,0.0,36.02482223510742 +39.0,0.0,31.359376907348633 +42.0,0.0,29.441497802734375 +45.0,0.0,23.710010528564453 +48.0,0.0,16.942583084106445 +51.0,0.0,10.612472534179688 +51.0,3.0,13.91585922241211 +48.0,3.0,25.633146286010742 +45.0,3.0,35.666622161865234 +42.0,3.0,47.82097625732422 +39.0,3.0,51.66775894165039 +36.0,3.0,56.049034118652344 +33.0,3.0,53.36924743652344 +30.0,3.0,60.00592803955078 +27.0,3.0,55.6519889831543 +24.0,3.0,56.74117660522461 +21.0,3.0,50.48721694946289 +18.0,3.0,50.86589050292969 +15.0,3.0,46.653587341308594 +12.0,3.0,47.796653747558594 +9.0,3.0,40.7733154296875 +6.0,3.0,32.021820068359375 +3.0,3.0,19.597667694091797 +0.0,3.0,11.720069885253906 +0.0,6.0,12.415507316589355 +3.0,6.0,25.417285919189453 +6.0,6.0,39.26513671875 +9.0,6.0,51.99945831298828 +12.0,6.0,58.902923583984375 +15.0,6.0,60.16744613647461 +18.0,6.0,65.4874496459961 +21.0,6.0,65.2559585571289 +24.0,6.0,70.87013244628906 +27.0,6.0,68.33891296386719 +30.0,6.0,73.90314483642578 +33.0,6.0,68.5235595703125 +36.0,6.0,69.29991149902344 +39.0,6.0,61.14052200317383 +42.0,6.0,56.21562957763672 +45.0,6.0,44.37640380859375 +48.0,6.0,30.165468215942383 +51.0,6.0,15.04761791229248 +51.0,9.0,14.901004791259766 +48.0,9.0,30.573949813842773 +45.0,9.0,46.87403869628906 +42.0,9.0,59.93819046020508 +39.0,9.0,65.44080352783203 +36.0,9.0,71.74441528320312 +33.0,9.0,73.13258361816406 +30.0,9.0,78.32367706298828 +27.0,9.0,72.56423950195312 +24.0,9.0,74.85733795166016 +21.0,9.0,67.2078857421875 +18.0,9.0,69.20716857910156 +15.0,9.0,62.89570999145508 +12.0,9.0,61.50480270385742 +9.0,9.0,55.820030212402344 +6.0,9.0,42.25038146972656 +3.0,9.0,26.486190795898438 +0.0,9.0,12.487135887145996 +0.0,12.0,13.28316593170166 +3.0,12.0,27.592864990234375 +6.0,12.0,45.407867431640625 +9.0,12.0,56.74275207519531 +12.0,12.0,66.66099548339844 +15.0,12.0,67.71942901611328 +18.0,12.0,70.50408172607422 +21.0,12.0,71.53450012207031 +24.0,12.0,74.66952514648438 +27.0,12.0,77.25540924072266 +30.0,12.0,77.02790069580078 +33.0,12.0,76.8592300415039 +36.0,12.0,72.8122787475586 +39.0,12.0,71.73584747314453 +42.0,12.0,62.642784118652344 +45.0,12.0,52.428924560546875 +48.0,12.0,31.378541946411133 +51.0,12.0,15.872342109680176 +51.0,15.0,16.349206924438477 +48.0,15.0,35.077247619628906 +45.0,15.0,53.25334548950195 +42.0,15.0,64.68919372558594 +39.0,15.0,71.4911117553711 +36.0,15.0,75.41664123535156 +33.0,15.0,82.293701171875 +30.0,15.0,79.06385803222656 +27.0,15.0,84.01229858398438 +24.0,15.0,76.08150482177734 +21.0,15.0,78.944580078125 +18.0,15.0,71.13353729248047 +15.0,15.0,70.5445556640625 +12.0,15.0,64.82073211669922 +9.0,15.0,59.2625846862793 +6.0,15.0,43.60395812988281 +3.0,15.0,26.67472267150879 +0.0,15.0,12.799768447875977 +0.0,18.0,12.875276565551758 +3.0,18.0,31.27374839782715 +6.0,18.0,45.815345764160156 +9.0,18.0,66.00385284423828 +12.0,18.0,65.22396850585938 +15.0,18.0,75.34418487548828 +18.0,18.0,73.82845306396484 +21.0,18.0,78.67325592041016 +24.0,18.0,76.57389068603516 +27.0,18.0,81.362060546875 +30.0,18.0,80.81549835205078 +33.0,18.0,78.11376190185547 +36.0,18.0,77.29745483398438 +39.0,18.0,72.1211166381836 +42.0,18.0,67.04203033447266 +45.0,18.0,50.469085693359375 +48.0,18.0,34.704463958740234 +51.0,18.0,15.974723815917969 +51.0,21.0,16.897014617919922 +48.0,21.0,33.09764862060547 +45.0,21.0,52.1219596862793 +42.0,21.0,65.96979522705078 +39.0,21.0,72.62822723388672 +36.0,21.0,76.74267578125 +33.0,21.0,77.28901672363281 +30.0,21.0,83.67584991455078 +27.0,21.0,80.31607818603516 +24.0,21.0,83.67402648925781 +21.0,21.0,75.14350128173828 +18.0,21.0,76.8718490600586 +15.0,21.0,70.19387817382812 +12.0,21.0,69.70466613769531 +9.0,21.0,61.775146484375 +6.0,21.0,47.686119079589844 +3.0,21.0,28.56328582763672 +0.0,21.0,13.313557624816895 +0.0,24.0,13.306502342224121 +3.0,24.0,29.761125564575195 +6.0,24.0,47.4908447265625 +9.0,24.0,62.285057067871094 +12.0,24.0,71.20887756347656 +15.0,24.0,71.1847915649414 +18.0,24.0,79.53018951416016 +21.0,24.0,75.23268127441406 +24.0,24.0,82.73504638671875 +27.0,24.0,79.50720977783203 +30.0,24.0,81.80725860595703 +33.0,24.0,77.40265655517578 +36.0,24.0,74.92031860351562 +39.0,24.0,73.71395874023438 +42.0,24.0,64.09619903564453 +45.0,24.0,53.457828521728516 +48.0,24.0,31.693166732788086 +51.0,24.0,16.065074920654297 +51.0,27.0,16.856834411621094 +48.0,27.0,36.163719177246094 +45.0,27.0,51.09242248535156 +42.0,27.0,65.22893524169922 +39.0,27.0,71.56756591796875 +36.0,27.0,73.19757080078125 +33.0,27.0,78.76758575439453 +30.0,27.0,78.32661437988281 +27.0,27.0,80.78496551513672 +24.0,27.0,75.46829223632812 +21.0,27.0,78.01837158203125 +18.0,27.0,73.45677185058594 +15.0,27.0,74.1617660522461 +12.0,27.0,67.82011413574219 +9.0,27.0,62.69002914428711 +6.0,27.0,46.347740173339844 +3.0,27.0,27.044240951538086 +0.0,27.0,12.65971851348877 +0.0,30.0,12.945517539978027 +3.0,30.0,29.790904998779297 +6.0,30.0,43.50529479980469 +9.0,30.0,63.24850082397461 +12.0,30.0,66.1111068725586 +15.0,30.0,70.57667541503906 +18.0,30.0,71.48323822021484 +21.0,30.0,73.40864562988281 +24.0,30.0,77.74864959716797 +27.0,30.0,73.79702758789062 +30.0,30.0,80.1552963256836 +33.0,30.0,74.7481689453125 +36.0,30.0,75.2175064086914 +39.0,30.0,66.4474105834961 +42.0,30.0,62.19047164916992 +45.0,30.0,50.341888427734375 +48.0,30.0,32.41354751586914 +51.0,30.0,15.366683006286621 +51.0,33.0,15.104120254516602 +48.0,33.0,32.7883415222168 +45.0,33.0,46.748138427734375 +42.0,33.0,60.82347869873047 +39.0,33.0,64.79631042480469 +36.0,33.0,69.27803802490234 +33.0,33.0,72.95076751708984 +30.0,33.0,71.9439468383789 +27.0,33.0,75.33061218261719 +24.0,33.0,71.28756713867188 +21.0,33.0,74.58164978027344 +18.0,33.0,68.28853607177734 +15.0,33.0,69.09322357177734 +12.0,33.0,63.62788772583008 +9.0,33.0,59.96952819824219 +6.0,33.0,43.82612991333008 +3.0,33.0,26.658864974975586 +0.0,33.0,13.032482147216797 +0.0,36.0,12.480171203613281 +3.0,36.0,28.66285514831543 +6.0,36.0,40.26759719848633 +9.0,36.0,58.84185028076172 +12.0,36.0,60.912200927734375 +15.0,36.0,65.7920913696289 +18.0,36.0,66.14551544189453 +21.0,36.0,66.70297241210938 +24.0,36.0,68.89405822753906 +27.0,36.0,69.09764862060547 +30.0,36.0,71.49556732177734 +33.0,36.0,66.1429672241211 +36.0,36.0,68.32942962646484 +39.0,36.0,60.33047103881836 +42.0,36.0,58.563377380371094 +45.0,36.0,45.15578842163086 +48.0,36.0,30.426462173461914 +51.0,36.0,14.677055358886719 +51.0,39.0,15.031648635864258 +48.0,39.0,30.18783950805664 +45.0,39.0,41.985225677490234 +42.0,39.0,55.70927810668945 +39.0,39.0,56.196563720703125 +36.0,39.0,63.73796844482422 +33.0,39.0,64.25867462158203 +30.0,39.0,66.23011016845703 +27.0,39.0,65.59911346435547 +24.0,39.0,64.09144592285156 +21.0,39.0,65.07719421386719 +18.0,39.0,60.18568801879883 +15.0,39.0,62.486934661865234 +12.0,39.0,56.43416976928711 +9.0,39.0,55.245365142822266 +6.0,39.0,39.178199768066406 +3.0,39.0,24.422975540161133 +0.0,39.0,12.069255828857422 +0.0,42.0,12.077136039733887 +3.0,42.0,24.589447021484375 +6.0,42.0,36.228973388671875 +9.0,42.0,53.814762115478516 +12.0,42.0,51.87379837036133 +15.0,42.0,57.48631286621094 +18.0,42.0,57.64259338378906 +21.0,42.0,58.9874267578125 +24.0,42.0,60.499908447265625 +27.0,42.0,61.20001983642578 +30.0,42.0,64.81261444091797 +33.0,42.0,60.32683563232422 +36.0,42.0,61.45504379272461 +39.0,42.0,53.3218879699707 +42.0,42.0,52.47466278076172 +45.0,42.0,40.53369903564453 +48.0,42.0,25.883970260620117 +51.0,42.0,14.040482521057129 +51.0,45.0,13.154291152954102 +48.0,45.0,25.87515640258789 +45.0,45.0,33.872772216796875 +42.0,45.0,45.421207427978516 +39.0,45.0,47.563819885253906 +36.0,45.0,50.661224365234375 +33.0,45.0,53.65985107421875 +30.0,45.0,53.412864685058594 +27.0,45.0,56.98063278198242 +24.0,45.0,52.75929641723633 +21.0,45.0,53.896392822265625 +18.0,45.0,50.91596984863281 +15.0,45.0,51.05351638793945 +12.0,45.0,46.2667236328125 +9.0,45.0,41.45918655395508 +6.0,45.0,32.60724639892578 +3.0,45.0,20.086332321166992 +0.0,45.0,11.932372093200684 +0.0,48.0,10.98884391784668 +3.0,48.0,17.6011962890625 +6.0,48.0,24.28634262084961 +9.0,48.0,32.49635314941406 +12.0,48.0,35.11099624633789 +15.0,48.0,36.6904411315918 +18.0,48.0,39.22359848022461 +21.0,48.0,38.23958969116211 +24.0,48.0,41.308433532714844 +27.0,48.0,39.35115432739258 +30.0,48.0,38.898834228515625 +33.0,48.0,38.80821228027344 +36.0,48.0,36.34837341308594 +39.0,48.0,35.93360900878906 +42.0,48.0,30.528120040893555 +45.0,48.0,27.028120040893555 +48.0,48.0,17.75089454650879 +51.0,48.0,10.791879653930664 diff --git a/sw/zdclg/sim-val/BOX50x50x56trapSimVal.root b/sw/zdclg/sim-val/BOX50x50x56trapSimVal.root new file mode 100644 index 0000000000000000000000000000000000000000..68e82123e8b3ef76b874545e16aedafc5d686f8a Binary files /dev/null and b/sw/zdclg/sim-val/BOX50x50x56trapSimVal.root differ diff --git a/sw/zdclg/sim-val/BOX50x50x70trapSimVal.root b/sw/zdclg/sim-val/BOX50x50x70trapSimVal.root new file mode 100644 index 0000000000000000000000000000000000000000..391406c4fd0dc76e913f75199f86cad98f221caa Binary files /dev/null and b/sw/zdclg/sim-val/BOX50x50x70trapSimVal.root differ diff --git a/sw/zdclg/sim-val/Comparison-plots.png b/sw/zdclg/sim-val/Comparison-plots.png new file mode 100644 index 0000000000000000000000000000000000000000..523d56fc2762b02646f3c7cb9a341952e2467723 Binary files /dev/null and b/sw/zdclg/sim-val/Comparison-plots.png differ diff --git a/sw/zdclg/sim-val/KUboxdata.root b/sw/zdclg/sim-val/KUboxdata.root new file mode 100644 index 0000000000000000000000000000000000000000..1d48c17e94698bc3151915fcc6a3b3cb98fcb719 Binary files /dev/null and b/sw/zdclg/sim-val/KUboxdata.root differ diff --git a/sw/zdclg/sim-val/KUcomparison.root b/sw/zdclg/sim-val/KUcomparison.root new file mode 100644 index 0000000000000000000000000000000000000000..2de74b927650a191d5124bed99dea9fe84fb8e13 Binary files /dev/null and b/sw/zdclg/sim-val/KUcomparison.root differ diff --git a/sw/zdclg/sim-val/KUsimValretry1-csv.root b/sw/zdclg/sim-val/KUsimValretry1-csv.root new file mode 100644 index 0000000000000000000000000000000000000000..58e30cf107757e9394c01e1a1a093042c57cff80 Binary files /dev/null and b/sw/zdclg/sim-val/KUsimValretry1-csv.root differ diff --git a/sw/zdclg/sim-val/NPLboxdata.root b/sw/zdclg/sim-val/NPLboxdata.root new file mode 100644 index 0000000000000000000000000000000000000000..32e211457bcb5071cbe6ae99eeb35cf77c002413 Binary files /dev/null and b/sw/zdclg/sim-val/NPLboxdata.root differ diff --git a/sw/zdclg/sim-val/NPLcomparison.root b/sw/zdclg/sim-val/NPLcomparison.root new file mode 100644 index 0000000000000000000000000000000000000000..047f0551072cb69def6f3e1b3d3ba36f75bba889 Binary files /dev/null and b/sw/zdclg/sim-val/NPLcomparison.root differ diff --git a/sw/zdclg/sim-val/NPLsimValretry1-csv.root b/sw/zdclg/sim-val/NPLsimValretry1-csv.root new file mode 100644 index 0000000000000000000000000000000000000000..4e3a3d6024cf87bf7f9abecdd99d28cbd9a49cb1 Binary files /dev/null and b/sw/zdclg/sim-val/NPLsimValretry1-csv.root differ diff --git a/sw/zdclg/sim-val/SIM50x50x56trapSimVal.root b/sw/zdclg/sim-val/SIM50x50x56trapSimVal.root new file mode 100644 index 0000000000000000000000000000000000000000..24394359020a02786174542ae0f39feec2677144 Binary files /dev/null and b/sw/zdclg/sim-val/SIM50x50x56trapSimVal.root differ diff --git a/sw/zdclg/sim-val/SIM50x50x70trapSimValredo.root b/sw/zdclg/sim-val/SIM50x50x70trapSimValredo.root new file mode 100644 index 0000000000000000000000000000000000000000..6ea83817cf31c0d7aada948a800503813e16cd37 Binary files /dev/null and b/sw/zdclg/sim-val/SIM50x50x70trapSimValredo.root differ diff --git a/sw/zdclg/sim-val/SIM70trap.root b/sw/zdclg/sim-val/SIM70trap.root new file mode 100644 index 0000000000000000000000000000000000000000..d82dcd0206120c211d9cd0e3b988491704c7878a Binary files /dev/null and b/sw/zdclg/sim-val/SIM70trap.root differ diff --git a/sw/zdclg/sim-val/SimValEM-1-csv.root b/sw/zdclg/sim-val/SimValEM-1-csv.root new file mode 100644 index 0000000000000000000000000000000000000000..deb0ad2f02a4a46d405cbedf15cb6f84cc3fcf8b Binary files /dev/null and b/sw/zdclg/sim-val/SimValEM-1-csv.root differ diff --git a/sw/zdclg/sim-val/canv.png b/sw/zdclg/sim-val/canv.png new file mode 100644 index 0000000000000000000000000000000000000000..f406764abd1d975734c16e74d7622b4aeb701398 Binary files /dev/null and b/sw/zdclg/sim-val/canv.png differ diff --git a/sw/zdclg/sim-val/canvas.png b/sw/zdclg/sim-val/canvas.png new file mode 100644 index 0000000000000000000000000000000000000000..9c36c6c36e714b3a0637d89824c4e8b140e10390 Binary files /dev/null and b/sw/zdclg/sim-val/canvas.png differ diff --git a/sw/zdclg/sim-val/comparison-50x50x56-trap.root b/sw/zdclg/sim-val/comparison-50x50x56-trap.root new file mode 100644 index 0000000000000000000000000000000000000000..1d4d717a77ad1ff9143a44c7c6e2c4c85574418b Binary files /dev/null and b/sw/zdclg/sim-val/comparison-50x50x56-trap.root differ diff --git a/sw/zdclg/sim-val/comparrison-50x50x70-trap.root b/sw/zdclg/sim-val/comparrison-50x50x70-trap.root new file mode 100644 index 0000000000000000000000000000000000000000..ac2048fb70a2933deeffe6fc67bec0261651641f Binary files /dev/null and b/sw/zdclg/sim-val/comparrison-50x50x70-trap.root differ diff --git a/sw/zdclg/sim-val/plotFromCSV.cpp b/sw/zdclg/sim-val/plotFromCSV.cpp new file mode 100644 index 0000000000000000000000000000000000000000..6239c5a0f75c3a0ff33b298ce3e0c8c75c0975b3 --- /dev/null +++ b/sw/zdclg/sim-val/plotFromCSV.cpp @@ -0,0 +1,249 @@ +/****************************************************************************** + * + * This script contains two primary functions. The first plotFromCSV will take a + * .CSV file with data int the format: + * + * x,y,z + * x,y,z + * + * And create a 2D histogram with the values contained. The histogram will be + * saved to a root file with the name given by the second argument of the function + * + * The second function is compareHistos which takes the names of two root files + * as inputs, retrieves a histogram from within both, and performs subtraction + * of the two. It then takes the subtracted histogram and fills another 1D + * histogram with the subtracted values, returning this histogram's RMS as the + * desired output + * + * TO RUN: + * Open an interactive ROOT session + * $root -l + * + * Load the script + * [0].L plotFromCSV.cpp + * + * Run either of the functions (whatever is necessary at the time) + * [1]plotFromCSV("rawData.csv","outputRootFileName.root") + * + * or + * * TO RUN: + * Open an interactive ROOT session + * $root -l + * + * Load the script + * [0].L plotFromCSV.cpp + * [1]compareHistos("file1.root","file2.root") + * + * As written, file1 should be the real data, while file2 is the simulated data. + * +*******************************************************************************/ + + +#include <fstream> +#include <string> +#include "TVectorD.h" +#include "TCanvas.h" +#include "TGraph.h" +#include "TFile.h" + + +using namespace std; + +string getDataPoint( string &input, size_t spaces = 1, string delim = "," ); + +void plotFromCSV(TString fileName, TString outFileName){ + + //Open the csv + ifstream file(fileName); + //Check if the file opened properly. Exit if not + if( !file.is_open() ){ + cout << "File didn't open" << endl; + return; + } + + //make sure the size of each histogram is the same && the bins are in the middle + float range = 57; + TH2F *h = new TH2F("lightguideintensity","Relative Intensity (Box experiment);X-plane (mm);Z-plane (mm)",19,-range/2.,range/2.,19,-range/2.,range/2.); + + //While we still haven't reached the end of the file, get the next line, parse it, and fill the histogram + //with the value on that line + string buffer; + while( !file.eof() ){ + getline(file,buffer); + + float x = atof(getDataPoint(buffer,1).c_str() ); + float y = atof(getDataPoint(buffer,1).c_str() ); + float counts = atof(getDataPoint(buffer,1).c_str() ); + + h->Fill(x-range/2.,y-range/2.,counts); + + } + + //Create a new root file to save the histogram to. "recreate" will overwrite any file with the same name + TFile f(outFileName.Data(),"recreate"); + + // Scale it to make it relative like plothisto does + h->Scale(1.0/h->GetMaximum()); + h->Write(); //Write the histogram to the file + + //Create a new TCanvas to draw the histogram onto + TCanvas *c = new TCanvas("canv","canv",800,600); + //gStyle->SetPalette(55); + h->Draw("colz"); //Draw it. colz is "Colored Z axis" + + f.Close(); //Close the file + +} + +void compareHistos( string file1, string file2){ + +//----------------------RETIREVE THE HISTOGRAMS--------------------------------- + //Open file 1 and retrieve the histogram from within + TFile f1(file1.c_str(),"read"); + TH2F *hreal = (TH2F*)f1.Get("lightguideintensity"); + // //normalize + // hreal->Scale(1./hreal->Integral()); + //hreal->Scale(1.0/hreal->GetMaximum()); + + //Open file 2 and retrieve the histogram from within + TFile f2(file2.c_str(),"read"); + TH2F *hsim = (TH2F*)f2.Get("eff"); + // //normalize + // h2->Scale(1./h2->Integral()); + + //make some same-size hists to work with later, based on hreal + TH2F *hdiff = (TH2F*)hreal->Clone(); + TH2F *hrat = (TH2F*)hreal->Clone(); + TH2F *hcopy = (TH2F*)hreal->Clone(); + hcopy->SetNameTitle("copy", "Difference;X-plane (mm);Z-plane (mm)"); + hdiff->SetNameTitle("difference", "Difference;X-plane (mm);Z-plane (mm)"); + hrat->SetNameTitle("divide", "Ratio;X-plane (mm);Z-plane (mm)"); + + + + //We want to subtract sim from real (add -1) + hdiff->Add(hsim, -1); + + + + //Create a new histogram to hold the differences for each bin + // TH1F *hDev = new TH1F("stdDev","stdDev",100,-10,10); + + // //For each bin in the original histogram, fill the new histogram + // //with the difference of the two + // int nBins = hcopy->GetNbinsX() * hdiff->GetNbinsY(); + // for(int bin = 0; bin < nBins; bin++){ + // float val = hdiff->GetBinContent(bin); + // hdiff->Fill(val); + // //h3->SetBinContent(bin,val); + + //} + + //make ratio histogram real/sim + hrat->Divide(hsim); + + // make percent error histogram + TH2F *hpercer = (TH2F*)hdiff->Clone(); + hpercer->SetNameTitle("percerror", "Percent Error;X-plane (mm);Z-plane (mm)"); + hpercer->Divide(hreal); + hpercer->Scale(100.); + hpercer->Write(); + + // //Retrieve the RMS from this new histogram + // float RMS = hDev->GetRMS(); + // cout << "RMS " << RMS << endl; + // //cout << "Percent error " << RMS << endl; + + // //Create a canvas to view the histograms on + TCanvas *c = new TCanvas("canvas","canvas",4000,1600); + TFile f("comparison.root","recreate"); + gStyle->SetOptStat(0); + c->Divide(3,2); + c->cd(1); + hreal->Draw("colz"); + hreal->Write(); + + c->cd(2); + hsim->Draw("colz"); + hsim->Write(); + + c->cd(3); + hdiff->Draw("colz"); + hdiff->Write(); + + c->cd(4); + hrat->Draw("colz"); + hrat->Write(); + + c->cd(5); + hpercer->Draw("cloz"); + hpercer->Write(); + + c->Print("Comparison-plots.png"); + // hDev->Write(); + + f.Close(); + delete c; + +} + +///gernerate a similar series of histograms. +//functionalize it. difference, ratio, relative error, +// all for histograms normalized in different ways + +// outer fucntion --open each file, retrieve histograms, +// loop --- for each normalization method +/// ---- noramlize both histograms +/// call anotehr function +/// other function will make all the analysis whatevers (subtract, dev, divide, per erreor, etc) +// write to file +// give things good names +//it would be nice to have a canvas for each normalization with all of the comparisons + + +string getDataPoint( string &input, size_t spaces, string delim ){ + size_t firstComma = input.find_first_of(delim.c_str()); + string buffer = input.substr(0, firstComma ); + input.erase(0,firstComma+spaces); + return buffer; +} + + +void averageHistos( string file1, string file2, string file3, string file4){ + +//----------------------RETIREVE THE HISTOGRAMS--------------------------------- + //Open file 1 and retrieve the histogram from within + TFile f1(file1.c_str(),"read"); + TH2F *h1 = (TH2F*)f1.Get("lightguideintensity"); + + + //Open file 2 and retrieve the histogram from within + TFile f2(file2.c_str(),"read"); + TH2F *h2 = (TH2F*)f2.Get("lightguideintensity"); + + //Open file 3 and retrieve the histogram from within + TFile f3(file3.c_str(),"read"); + TH2F *h3 = (TH2F*)f3.Get("lightguideintensity"); + + //Open file 4 and retrieve the histogram from within + TFile f4(file4.c_str(),"read"); + TH2F *h4 = (TH2F*)f4.Get("lightguideintensity"); + + + + //make some same-size hists to work with later, clone of h1 + TH2F *htotal = (TH2F*)h1->Clone(); + + //add all the other histograms to it + htotal->Add(h2); + htotal->Add(h3); + htotal->Add(h4); + + //divide total by 4? + TH2F *haverage = (TH2F*)htotal->Clone(); + haverage->Divide(4) //might need to make a histogram where every value is 4 or something + haverage->Write(); + + +} + diff --git a/sw/zdclg/sim-val/realpmttest3mm1.csv b/sw/zdclg/sim-val/realpmttest3mm1.csv new file mode 100644 index 0000000000000000000000000000000000000000..9cd0ce3d74087a12a2af9a73865ebfff62aeb0e0 --- /dev/null +++ b/sw/zdclg/sim-val/realpmttest3mm1.csv @@ -0,0 +1,361 @@ +0.0,0.0,8.223340034484863 +3.0,0.0,8.632482528686523 +6.0,0.0,11.018050193786621 +9.0,0.0,12.751397132873535 +12.0,0.0,13.597135543823242 +15.0,0.0,13.665828704833984 +18.0,0.0,14.203085899353027 +21.0,0.0,14.25529670715332 +24.0,0.0,13.926020622253418 +27.0,0.0,14.189326286315918 +30.0,0.0,13.765819549560547 +33.0,0.0,12.65500545501709 +36.0,0.0,11.965215682983398 +39.0,0.0,11.681989669799805 +42.0,0.0,10.707557678222656 +45.0,0.0,9.794904708862305 +48.0,0.0,8.544703483581543 +51.0,0.0,6.679055213928223 +54.0,0.0,5.560502529144287 +54.0,3.0,6.966914653778076 +51.0,3.0,15.635698318481445 +48.0,3.0,31.62674331665039 +45.0,3.0,41.3026237487793 +42.0,3.0,43.48781967163086 +39.0,3.0,47.38262176513672 +36.0,3.0,51.518211364746094 +33.0,3.0,57.35878372192383 +30.0,3.0,59.63758850097656 +27.0,3.0,63.347225189208984 +24.0,3.0,60.62544631958008 +21.0,3.0,62.7288932800293 +18.0,3.0,57.627689361572266 +15.0,3.0,57.52763748168945 +12.0,3.0,54.2827033996582 +9.0,3.0,50.908321380615234 +6.0,3.0,30.652904510498047 +3.0,3.0,13.936079978942871 +0.0,3.0,8.674059867858887 +0.0,6.0,9.357687950134277 +3.0,6.0,23.398191452026367 +6.0,6.0,58.78990936279297 +9.0,6.0,92.51378631591797 +12.0,6.0,106.71629333496094 +15.0,6.0,112.17395782470703 +18.0,6.0,118.3539810180664 +21.0,6.0,121.82969665527344 +24.0,6.0,122.40459442138672 +27.0,6.0,124.78893280029297 +30.0,6.0,121.02274322509766 +33.0,6.0,119.2736587524414 +36.0,6.0,107.25030517578125 +39.0,6.0,105.52885437011719 +42.0,6.0,91.07769775390625 +45.0,6.0,90.82469177246094 +48.0,6.0,64.66162872314453 +51.0,6.0,34.5283203125 +54.0,6.0,9.221778869628906 +54.0,9.0,11.22292423248291 +51.0,9.0,50.77006149291992 +48.0,9.0,96.8097152709961 +45.0,9.0,122.39073181152344 +42.0,9.0,130.8435516357422 +39.0,9.0,144.99383544921875 +36.0,9.0,148.64308166503906 +33.0,9.0,164.83145141601562 +30.0,9.0,168.64146423339844 +27.0,9.0,178.74964904785156 +24.0,9.0,168.49606323242188 +21.0,9.0,171.5408172607422 +18.0,9.0,158.7672576904297 +15.0,9.0,158.80999755859375 +12.0,9.0,146.341552734375 +9.0,9.0,127.34382629394531 +6.0,9.0,72.6343002319336 +3.0,9.0,28.4188232421875 +0.0,9.0,9.681818962097168 +0.0,12.0,9.168441772460938 +3.0,12.0,30.995376586914062 +6.0,12.0,80.84862518310547 +9.0,12.0,142.0880584716797 +12.0,12.0,154.78256225585938 +15.0,12.0,170.3032684326172 +18.0,12.0,172.8176727294922 +21.0,12.0,186.50917053222656 +24.0,12.0,185.67221069335938 +27.0,12.0,191.45556640625 +30.0,12.0,184.40016174316406 +33.0,12.0,181.39837646484375 +36.0,12.0,170.15518188476562 +39.0,12.0,153.96348571777344 +42.0,12.0,145.3533935546875 +45.0,12.0,132.0164794921875 +48.0,12.0,106.24132537841797 +51.0,12.0,52.00577926635742 +54.0,12.0,11.786844253540039 +54.0,15.0,11.556894302368164 +51.0,15.0,56.468502044677734 +48.0,15.0,109.94068145751953 +45.0,15.0,142.45712280273438 +42.0,15.0,149.7239227294922 +39.0,15.0,163.85247802734375 +36.0,15.0,179.92897033691406 +33.0,15.0,185.14613342285156 +30.0,15.0,196.09243774414062 +27.0,15.0,194.05740356445312 +24.0,15.0,204.66497802734375 +21.0,15.0,189.8877716064453 +18.0,15.0,188.30149841308594 +15.0,15.0,173.73287963867188 +12.0,15.0,168.96539306640625 +9.0,15.0,142.56663513183594 +6.0,15.0,87.23987579345703 +3.0,15.0,32.16544723510742 +0.0,15.0,9.663819313049316 +0.0,18.0,10.125216484069824 +3.0,18.0,34.28390884399414 +6.0,18.0,94.2190933227539 +9.0,18.0,150.97274780273438 +12.0,18.0,179.4921875 +15.0,18.0,182.0284881591797 +18.0,18.0,199.01715087890625 +21.0,18.0,197.9842987060547 +24.0,18.0,213.66978454589844 +27.0,18.0,202.45240783691406 +30.0,18.0,207.0391387939453 +33.0,18.0,190.79269409179688 +36.0,18.0,187.8951873779297 +39.0,18.0,168.2489013671875 +42.0,18.0,160.19796752929688 +45.0,18.0,150.3136444091797 +48.0,18.0,112.7449951171875 +51.0,18.0,57.581024169921875 +54.0,18.0,11.768824577331543 +54.0,21.0,13.761598587036133 +51.0,21.0,61.44198989868164 +48.0,21.0,126.24958038330078 +45.0,21.0,153.6797637939453 +42.0,21.0,167.16781616210938 +39.0,21.0,176.95909118652344 +36.0,21.0,192.8393096923828 +33.0,21.0,206.0370635986328 +30.0,21.0,211.0938262939453 +27.0,21.0,220.9796142578125 +24.0,21.0,210.2980499267578 +21.0,21.0,217.0811767578125 +18.0,21.0,197.1422576904297 +15.0,21.0,198.4344482421875 +12.0,21.0,179.70703125 +9.0,21.0,156.8488006591797 +6.0,21.0,90.06819152832031 +3.0,21.0,35.06950759887695 +0.0,21.0,9.89157772064209 +0.0,24.0,9.740673065185547 +3.0,24.0,36.18772888183594 +6.0,24.0,92.88335418701172 +9.0,24.0,173.45562744140625 +12.0,24.0,187.91000366210938 +15.0,24.0,203.06326293945312 +18.0,24.0,209.42091369628906 +21.0,24.0,222.9650421142578 +24.0,24.0,224.4437713623047 +27.0,24.0,230.16250610351562 +30.0,24.0,221.9874267578125 +33.0,24.0,213.47787475585938 +36.0,24.0,204.22781372070312 +39.0,24.0,184.70932006835938 +42.0,24.0,181.83607482910156 +45.0,24.0,163.46328735351562 +48.0,24.0,129.7786407470703 +51.0,24.0,64.1163330078125 +54.0,24.0,14.736050605773926 +54.0,27.0,13.164894104003906 +51.0,27.0,64.3661117553711 +48.0,27.0,129.70590209960938 +45.0,27.0,169.4385986328125 +42.0,27.0,183.19430541992188 +39.0,27.0,190.76426696777344 +36.0,27.0,213.72854614257812 +33.0,27.0,210.67005920410156 +30.0,27.0,231.03121948242188 +27.0,27.0,226.1781463623047 +24.0,27.0,233.04638671875 +21.0,27.0,223.9647979736328 +18.0,27.0,212.3204803466797 +15.0,27.0,207.23825073242188 +12.0,27.0,195.10874938964844 +9.0,27.0,172.0885467529297 +6.0,27.0,97.40985107421875 +3.0,27.0,38.895748138427734 +0.0,27.0,9.756543159484863 +0.0,30.0,10.040542602539062 +3.0,30.0,35.812068939208984 +6.0,30.0,100.83345031738281 +9.0,30.0,169.6417999267578 +12.0,30.0,188.68679809570312 +15.0,30.0,208.3905029296875 +18.0,30.0,210.05674743652344 +21.0,30.0,233.31210327148438 +24.0,30.0,225.7169189453125 +27.0,30.0,238.48394775390625 +30.0,30.0,222.9880828857422 +33.0,30.0,223.42173767089844 +36.0,30.0,206.14688110351562 +39.0,30.0,196.3558807373047 +42.0,30.0,181.03717041015625 +45.0,30.0,167.595458984375 +48.0,30.0,130.0935821533203 +51.0,30.0,63.750301361083984 +54.0,30.0,13.684080123901367 +54.0,33.0,13.04545783996582 +51.0,33.0,64.26112365722656 +48.0,33.0,128.3289337158203 +45.0,33.0,165.82205200195312 +42.0,33.0,181.07904052734375 +39.0,33.0,191.53713989257812 +36.0,33.0,213.79234313964844 +33.0,33.0,214.729736328125 +30.0,33.0,231.9583282470703 +27.0,33.0,225.16009521484375 +24.0,33.0,230.33119201660156 +21.0,33.0,216.3810272216797 +18.0,33.0,208.94239807128906 +15.0,33.0,199.57533264160156 +12.0,33.0,189.29345703125 +9.0,33.0,166.17408752441406 +6.0,33.0,92.29170989990234 +3.0,33.0,37.30971908569336 +0.0,33.0,9.646803855895996 +0.0,36.0,9.715587615966797 +3.0,36.0,32.45840072631836 +6.0,36.0,89.58969116210938 +9.0,36.0,161.61048889160156 +12.0,36.0,178.8910675048828 +15.0,36.0,198.36892700195312 +18.0,36.0,197.15017700195312 +21.0,36.0,212.66615295410156 +24.0,36.0,213.77516174316406 +27.0,36.0,218.98377990722656 +30.0,36.0,219.24293518066406 +33.0,36.0,206.68255615234375 +36.0,36.0,203.87205505371094 +39.0,36.0,178.11935424804688 +42.0,36.0,175.44854736328125 +45.0,36.0,156.32781982421875 +48.0,36.0,124.95159912109375 +51.0,36.0,66.31363677978516 +54.0,36.0,14.405588150024414 +54.0,39.0,12.171457290649414 +51.0,39.0,59.30279541015625 +48.0,39.0,120.33637237548828 +45.0,39.0,152.06153869628906 +42.0,39.0,166.6638641357422 +39.0,39.0,172.39035034179688 +36.0,39.0,189.8953094482422 +33.0,39.0,198.9905242919922 +30.0,39.0,202.1100616455078 +27.0,39.0,212.53170776367188 +24.0,39.0,201.9004364013672 +21.0,39.0,206.97531127929688 +18.0,39.0,188.61474609375 +15.0,39.0,186.3254852294922 +12.0,39.0,175.2447967529297 +9.0,39.0,150.48419189453125 +6.0,39.0,92.20777893066406 +3.0,39.0,35.14121627807617 +0.0,39.0,9.953678131103516 +0.0,42.0,9.543416976928711 +3.0,42.0,32.444149017333984 +6.0,42.0,89.64564514160156 +9.0,42.0,148.39529418945312 +12.0,42.0,175.7942657470703 +15.0,42.0,173.52316284179688 +18.0,42.0,190.27642822265625 +21.0,42.0,191.5433807373047 +24.0,42.0,200.55824279785156 +27.0,42.0,203.64784240722656 +30.0,42.0,193.7401885986328 +33.0,42.0,195.3711395263672 +36.0,42.0,176.48184204101562 +39.0,42.0,173.7635040283203 +42.0,42.0,153.0679168701172 +45.0,42.0,146.40310668945312 +48.0,42.0,108.88893127441406 +51.0,42.0,56.199729919433594 +54.0,42.0,11.65386962890625 +54.0,45.0,11.414180755615234 +51.0,45.0,54.593284606933594 +48.0,45.0,99.34085083007812 +45.0,45.0,134.15538024902344 +42.0,45.0,137.51370239257812 +39.0,45.0,149.3921356201172 +36.0,45.0,162.0231475830078 +33.0,45.0,165.21238708496094 +30.0,45.0,181.6805419921875 +27.0,45.0,177.63111877441406 +24.0,45.0,182.28799438476562 +21.0,45.0,171.96566772460938 +18.0,45.0,162.96205139160156 +15.0,45.0,158.5580596923828 +12.0,45.0,149.26600646972656 +9.0,45.0,133.3162078857422 +6.0,45.0,72.96846008300781 +3.0,45.0,29.581567764282227 +0.0,45.0,9.113507270812988 +0.0,48.0,8.739306449890137 +3.0,48.0,18.97722625732422 +6.0,48.0,46.56330490112305 +9.0,48.0,82.97206115722656 +12.0,48.0,91.62491607666016 +15.0,48.0,99.08025360107422 +18.0,48.0,106.0158920288086 +21.0,48.0,105.67584228515625 +24.0,48.0,117.73377227783203 +27.0,48.0,110.47693634033203 +30.0,48.0,117.60655975341797 +33.0,48.0,109.59306335449219 +36.0,48.0,108.08890533447266 +39.0,48.0,99.6284408569336 +42.0,48.0,90.15846252441406 +45.0,48.0,88.73528289794922 +48.0,48.0,65.7353286743164 +51.0,48.0,39.403690338134766 +54.0,48.0,9.273306846618652 +54.0,51.0,6.704492568969727 +51.0,51.0,15.907095909118652 +48.0,51.0,28.961679458618164 +45.0,51.0,37.226200103759766 +42.0,51.0,38.81504440307617 +39.0,51.0,41.13459396362305 +36.0,51.0,41.85222244262695 +33.0,51.0,45.65357971191406 +30.0,51.0,46.68521499633789 +27.0,51.0,46.37469482421875 +24.0,51.0,48.16796112060547 +21.0,51.0,42.32746887207031 +18.0,51.0,42.37325668334961 +15.0,51.0,38.961910247802734 +12.0,51.0,38.31491470336914 +9.0,51.0,32.78713607788086 +6.0,51.0,20.509477615356445 +3.0,51.0,10.937909126281738 +0.0,51.0,8.50245189666748 +0.0,54.0,8.828160285949707 +3.0,54.0,8.692160606384277 +6.0,54.0,9.291879653930664 +9.0,54.0,10.813708305358887 +12.0,54.0,11.520482063293457 +15.0,54.0,13.296361923217773 +18.0,54.0,15.537065505981445 +21.0,54.0,15.753497123718262 +24.0,54.0,15.30876350402832 +27.0,54.0,13.822341918945312 +30.0,54.0,13.463688850402832 +33.0,54.0,10.61365795135498 +36.0,54.0,10.714502334594727 +39.0,54.0,10.72075366973877 +42.0,54.0,9.602120399475098 +45.0,54.0,9.372774124145508 +48.0,54.0,8.022482872009277 +51.0,54.0,6.548351764678955 +54.0,54.0,5.709286689758301 diff --git a/sw/zdclg/sim-val/small-trap-3mm-11.csv b/sw/zdclg/sim-val/small-trap-3mm-11.csv new file mode 100644 index 0000000000000000000000000000000000000000..aad0c61975c8c3e08ff71345bab4e7f9349eeaaf --- /dev/null +++ b/sw/zdclg/sim-val/small-trap-3mm-11.csv @@ -0,0 +1,361 @@ +0.0,0.0,8.979809761047363 +3.0,0.0,9.769055366516113 +6.0,0.0,11.558713912963867 +9.0,0.0,13.558552742004395 +12.0,0.0,14.802642822265625 +15.0,0.0,15.610462188720703 +18.0,0.0,16.669769287109375 +21.0,0.0,17.2973575592041 +24.0,0.0,18.381216049194336 +27.0,0.0,18.2979793548584 +30.0,0.0,18.74833106994629 +33.0,0.0,17.297758102416992 +36.0,0.0,16.51534652709961 +39.0,0.0,15.996281623840332 +42.0,0.0,14.198472023010254 +45.0,0.0,12.831607818603516 +48.0,0.0,10.660512924194336 +51.0,0.0,7.801788806915283 +54.0,0.0,7.524190902709961 +54.0,3.0,7.867527484893799 +51.0,3.0,10.843990325927734 +48.0,3.0,19.11410140991211 +45.0,3.0,23.72051239013672 +42.0,3.0,31.023155212402344 +39.0,3.0,31.638090133666992 +36.0,3.0,34.99889373779297 +33.0,3.0,34.5240592956543 +30.0,3.0,35.40111541748047 +27.0,3.0,35.71150588989258 +24.0,3.0,36.18435287475586 +21.0,3.0,33.22039031982422 +18.0,3.0,32.214935302734375 +15.0,3.0,31.02910614013672 +12.0,3.0,28.673648834228516 +9.0,3.0,24.52927589416504 +6.0,3.0,18.1643009185791 +3.0,3.0,11.689658164978027 +0.0,3.0,9.36177921295166 +0.0,6.0,9.429728507995605 +3.0,6.0,16.439355850219727 +6.0,6.0,26.407859802246094 +9.0,6.0,37.71187973022461 +12.0,6.0,47.213626861572266 +15.0,6.0,46.487770080566406 +18.0,6.0,51.97437286376953 +21.0,6.0,52.19607162475586 +24.0,6.0,59.799537658691406 +27.0,6.0,58.527618408203125 +30.0,6.0,61.79564666748047 +33.0,6.0,57.149085998535156 +36.0,6.0,58.780330657958984 +39.0,6.0,51.029998779296875 +42.0,6.0,50.773216247558594 +45.0,6.0,39.48445129394531 +48.0,6.0,28.685598373413086 +51.0,6.0,14.544763565063477 +54.0,6.0,8.262140274047852 +54.0,9.0,8.453276634216309 +51.0,9.0,17.032934188842773 +48.0,9.0,32.54642105102539 +45.0,9.0,47.020774841308594 +42.0,9.0,59.01538848876953 +39.0,9.0,62.26417922973633 +36.0,9.0,69.31021881103516 +33.0,9.0,69.2862319946289 +30.0,9.0,72.7985610961914 +27.0,9.0,68.89498138427734 +24.0,9.0,69.82845306396484 +21.0,9.0,64.49052429199219 +18.0,9.0,65.65592956542969 +15.0,9.0,56.741214752197266 +12.0,9.0,59.02846145629883 +9.0,9.0,46.88008117675781 +6.0,9.0,33.95148849487305 +3.0,9.0,17.625226974487305 +0.0,9.0,9.51308536529541 +0.0,12.0,9.857346534729004 +3.0,12.0,20.843406677246094 +6.0,12.0,34.38866424560547 +9.0,12.0,49.30525588989258 +12.0,12.0,60.33185958862305 +15.0,12.0,58.994049072265625 +18.0,12.0,67.7518081665039 +21.0,12.0,66.58090209960938 +24.0,12.0,76.49192810058594 +27.0,12.0,72.77821350097656 +30.0,12.0,79.21142578125 +33.0,12.0,72.86005401611328 +36.0,12.0,74.7535171508789 +39.0,12.0,65.96212768554688 +42.0,12.0,62.353458404541016 +45.0,12.0,50.059669494628906 +48.0,12.0,35.90372848510742 +51.0,12.0,16.250120162963867 +54.0,12.0,8.374743461608887 +54.0,15.0,8.896965026855469 +51.0,15.0,18.796321868896484 +48.0,15.0,36.024742126464844 +45.0,15.0,50.35841369628906 +42.0,15.0,65.06632232666016 +39.0,15.0,66.61361694335938 +36.0,15.0,75.54462432861328 +33.0,15.0,75.35877990722656 +30.0,15.0,81.19754791259766 +27.0,15.0,75.8886947631836 +24.0,15.0,77.36561584472656 +21.0,15.0,71.67859649658203 +18.0,15.0,71.86518859863281 +15.0,15.0,63.49543762207031 +12.0,15.0,63.317649841308594 +9.0,15.0,52.93040084838867 +6.0,15.0,36.97187805175781 +3.0,15.0,20.34306526184082 +0.0,15.0,9.841909408569336 +0.0,18.0,10.046180725097656 +3.0,18.0,21.899517059326172 +6.0,18.0,38.148189544677734 +9.0,18.0,54.30746841430664 +12.0,18.0,65.72896575927734 +15.0,18.0,66.57696533203125 +18.0,18.0,71.846435546875 +21.0,18.0,71.50357818603516 +24.0,18.0,77.7367172241211 +27.0,18.0,77.78509521484375 +30.0,18.0,79.78876495361328 +33.0,18.0,78.7260971069336 +36.0,18.0,74.59447479248047 +39.0,18.0,70.76304626464844 +42.0,18.0,65.330810546875 +45.0,18.0,54.98736572265625 +48.0,18.0,37.325687408447266 +51.0,18.0,18.929277420043945 +54.0,18.0,9.051849365234375 +54.0,21.0,8.572935104370117 +51.0,21.0,19.280824661254883 +48.0,21.0,37.739013671875 +45.0,21.0,52.27199172973633 +42.0,21.0,64.79582214355469 +39.0,21.0,70.32357788085938 +36.0,21.0,74.55938720703125 +33.0,21.0,78.17753601074219 +30.0,21.0,77.38153839111328 +27.0,21.0,79.26219177246094 +24.0,21.0,74.64838409423828 +21.0,21.0,76.37381744384766 +18.0,21.0,70.6225814819336 +15.0,21.0,72.15767669677734 +12.0,21.0,63.12107467651367 +9.0,21.0,60.59383773803711 +6.0,21.0,39.55867385864258 +3.0,21.0,23.23185920715332 +0.0,21.0,10.114984512329102 +0.0,24.0,10.47463321685791 +3.0,24.0,24.43830108642578 +6.0,24.0,39.51774978637695 +9.0,24.0,58.25898361206055 +12.0,24.0,64.75785064697266 +15.0,24.0,72.4654541015625 +18.0,24.0,70.15928649902344 +21.0,24.0,76.847900390625 +24.0,24.0,73.30660247802734 +27.0,24.0,80.22462463378906 +30.0,24.0,78.1207046508789 +33.0,24.0,80.3994140625 +36.0,24.0,72.9500503540039 +39.0,24.0,71.23934936523438 +42.0,24.0,64.86088562011719 +45.0,24.0,53.331485748291016 +48.0,24.0,36.89362716674805 +51.0,24.0,17.431819915771484 +54.0,24.0,8.915989875793457 +54.0,27.0,8.520140647888184 +51.0,27.0,19.48387908935547 +48.0,27.0,35.08002853393555 +45.0,27.0,54.946754455566406 +42.0,27.0,63.4188346862793 +39.0,27.0,72.62993621826172 +36.0,27.0,73.13562774658203 +33.0,27.0,76.54291534423828 +30.0,27.0,77.51863098144531 +27.0,27.0,76.57395935058594 +24.0,27.0,77.2800521850586 +21.0,27.0,72.25408172607422 +18.0,27.0,74.68821716308594 +15.0,27.0,68.3388442993164 +12.0,27.0,69.28946685791016 +9.0,27.0,57.161468505859375 +6.0,27.0,43.04043197631836 +3.0,27.0,23.090200424194336 +0.0,27.0,10.422974586486816 +0.0,30.0,10.37075424194336 +3.0,30.0,23.900312423706055 +6.0,30.0,40.61642074584961 +9.0,30.0,53.712120056152344 +12.0,30.0,67.98589324951172 +15.0,30.0,66.1797866821289 +18.0,30.0,73.70491790771484 +21.0,30.0,69.7074203491211 +24.0,30.0,74.5439682006836 +27.0,30.0,73.2273178100586 +30.0,30.0,76.79862976074219 +33.0,30.0,75.11196899414062 +36.0,30.0,70.50032043457031 +39.0,30.0,69.11837005615234 +42.0,30.0,61.8619499206543 +45.0,30.0,55.26795959472656 +48.0,30.0,34.4548454284668 +51.0,30.0,18.17905616760254 +54.0,30.0,8.593165397644043 +54.0,33.0,8.458080291748047 +51.0,33.0,17.562280654907227 +48.0,33.0,34.85442352294922 +45.0,33.0,48.75719451904297 +42.0,33.0,59.630943298339844 +39.0,33.0,67.15846252441406 +36.0,33.0,66.51972961425781 +33.0,33.0,75.16162109375 +30.0,33.0,70.77298736572266 +27.0,33.0,74.96862030029297 +24.0,33.0,69.80682373046875 +21.0,33.0,70.86956787109375 +18.0,33.0,67.89960479736328 +15.0,33.0,66.55799102783203 +12.0,33.0,61.94700622558594 +9.0,33.0,53.804664611816406 +6.0,33.0,38.812744140625 +3.0,33.0,22.367387771606445 +0.0,33.0,10.478431701660156 +0.0,36.0,10.225226402282715 +3.0,36.0,24.2363224029541 +6.0,36.0,36.36100387573242 +9.0,36.0,53.244140625 +12.0,36.0,58.21400833129883 +15.0,36.0,62.419891357421875 +18.0,36.0,65.07770538330078 +21.0,36.0,65.59526824951172 +24.0,36.0,68.86848449707031 +27.0,36.0,66.81778717041016 +30.0,36.0,72.99250030517578 +33.0,36.0,65.86029052734375 +36.0,36.0,66.1446762084961 +39.0,36.0,60.32040023803711 +42.0,36.0,56.46680450439453 +45.0,36.0,46.94363784790039 +48.0,36.0,33.17557907104492 +51.0,36.0,14.893145561218262 +54.0,36.0,8.599286079406738 +54.0,39.0,7.898904323577881 +51.0,39.0,16.085668563842773 +48.0,39.0,30.67870330810547 +45.0,39.0,43.677940368652344 +42.0,39.0,53.666282653808594 +39.0,39.0,58.692955017089844 +36.0,39.0,60.8711051940918 +33.0,39.0,65.96882629394531 +30.0,39.0,64.5948715209961 +27.0,39.0,68.03955078125 +24.0,39.0,63.06476593017578 +21.0,39.0,64.31430053710938 +18.0,39.0,59.335758209228516 +15.0,39.0,61.06386947631836 +12.0,39.0,56.096492767333984 +9.0,39.0,51.45097351074219 +6.0,39.0,34.878089904785156 +3.0,39.0,20.319446563720703 +0.0,39.0,9.941165924072266 +0.0,42.0,10.0560302734375 +3.0,42.0,21.239215850830078 +6.0,42.0,32.18836212158203 +9.0,42.0,49.437679290771484 +12.0,42.0,51.08236312866211 +15.0,42.0,56.36674499511719 +18.0,42.0,56.4539794921875 +21.0,42.0,59.15484619140625 +24.0,42.0,58.99013137817383 +27.0,42.0,62.69797897338867 +30.0,42.0,62.298179626464844 +33.0,42.0,60.39311599731445 +36.0,42.0,60.30049133300781 +39.0,42.0,53.09147644042969 +42.0,42.0,52.98702621459961 +45.0,42.0,42.44757843017578 +48.0,42.0,31.099668502807617 +51.0,42.0,14.38907527923584 +54.0,42.0,7.842321395874023 +54.0,45.0,7.747386932373047 +51.0,45.0,14.650552749633789 +48.0,45.0,29.024995803833008 +45.0,45.0,38.84888458251953 +42.0,45.0,50.917057037353516 +39.0,45.0,51.67447280883789 +36.0,45.0,55.6170768737793 +33.0,45.0,58.38944625854492 +30.0,45.0,58.23340606689453 +27.0,45.0,59.961448669433594 +24.0,45.0,55.99831008911133 +21.0,45.0,58.63162612915039 +18.0,45.0,53.559295654296875 +15.0,45.0,54.6512565612793 +12.0,45.0,47.17827224731445 +9.0,45.0,44.29923629760742 +6.0,45.0,31.458934783935547 +3.0,45.0,17.84372901916504 +0.0,45.0,10.054542541503906 +0.0,48.0,9.484312057495117 +3.0,48.0,19.11037254333496 +6.0,48.0,25.61745834350586 +9.0,48.0,37.0888557434082 +12.0,48.0,40.19367980957031 +15.0,48.0,45.54817199707031 +18.0,48.0,46.548954010009766 +21.0,48.0,47.257144927978516 +24.0,48.0,49.28049087524414 +27.0,48.0,50.40380096435547 +30.0,48.0,51.68402099609375 +33.0,48.0,48.114322662353516 +36.0,48.0,49.967105865478516 +39.0,48.0,44.09455108642578 +42.0,48.0,42.260372161865234 +45.0,48.0,33.53673553466797 +48.0,48.0,24.80830192565918 +51.0,48.0,11.90632152557373 +54.0,48.0,7.502401828765869 +54.0,51.0,7.381678581237793 +51.0,51.0,10.320452690124512 +48.0,51.0,17.692834854125977 +45.0,51.0,23.02423095703125 +42.0,51.0,29.111587524414062 +39.0,51.0,30.2839298248291 +36.0,51.0,31.45091438293457 +33.0,51.0,33.009910583496094 +30.0,51.0,32.32900619506836 +27.0,51.0,34.32722473144531 +24.0,51.0,33.350894927978516 +21.0,51.0,33.407798767089844 +18.0,51.0,30.54283332824707 +15.0,51.0,31.184743881225586 +12.0,51.0,27.619426727294922 +9.0,51.0,25.81599998474121 +6.0,51.0,18.956140518188477 +3.0,51.0,12.737970352172852 +0.0,51.0,9.464632987976074 +0.0,54.0,8.920673370361328 +3.0,54.0,9.77953815460205 +6.0,54.0,10.816070556640625 +9.0,54.0,13.335125923156738 +12.0,54.0,14.131034851074219 +15.0,54.0,14.22109603881836 +18.0,54.0,14.793065071105957 +21.0,54.0,14.609075546264648 +24.0,54.0,15.907125473022461 +27.0,54.0,15.61815071105957 +30.0,54.0,16.162513732910156 +33.0,54.0,15.298140525817871 +36.0,54.0,14.732080459594727 +39.0,54.0,13.911828994750977 +42.0,54.0,13.022844314575195 +45.0,54.0,11.821276664733887 +48.0,54.0,10.008613586425781 +51.0,54.0,7.420653343200684 +54.0,54.0,6.923316478729248 diff --git a/sw/zdclg/sim-val/test.png b/sw/zdclg/sim-val/test.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c3e9f8d5b6d4526721d75a59b408fb99a78ef5 Binary files /dev/null and b/sw/zdclg/sim-val/test.png differ