diff --git a/Armory/ClassQQQ.h b/Armory/ClassQQQ.h index 1ad1d88..8cfb3d3 100644 --- a/Armory/ClassQQQ.h +++ b/Armory/ClassQQQ.h @@ -100,13 +100,13 @@ inline void QQQ::Clear(){ } inline void QQQ::ConstructGeo(){ - TGeoVolume *qqq = geom->MakeTubs("qqq", Al, qqqR1, qqqR2, 0.5, 5, 85); + TGeoVolume *qqq = geom->MakeTubs("qqq", Al, qqqR1, qqqR2, 0.5, 5, 85); // thickness 0.5 mm, phi from 5 to 90 deg in each quadrant qqq->SetLineColor(7); for( int i = 0; i < 4; i++){ - worldBox->AddNode(qqq, i+1, new TGeoCombiTrans( 0, + worldBox->AddNode(qqq, i+1, new TGeoCombiTrans( 0, 0, qqqZPos, - new TGeoRotation("rot1", 360/4 * (i), 0., 0.))); + new TGeoRotation("rot1", 360/4 * (i), 0., 0.))); //arguments are (name, material, inner radius, outer radius, half length in z, start phi, delta phi } } @@ -120,10 +120,6 @@ inline void QQQ::FindQQQPos(TVector3 pos, chDn = -1; chBk = -1; - //-------------------------------------------- - // Intersect trajectory with QQQ plane - //-------------------------------------------- - if( TMath::Abs(direction.Z()) < 1e-10 ) return; double t = (qqqZPos - pos.Z()) / direction.Z(); @@ -166,10 +162,6 @@ inline void QQQ::FindQQQPos(TVector3 pos, if( id < 0 ) return; - //-------------------------------------------- - // Ring number (32 strips) - //-------------------------------------------- - const double ringWidth = (qqqR2 - qqqR1)/32.0; diff --git a/Armory/anasenMS.cpp b/Armory/anasenMS.cpp index 2be207b..6abab3e 100644 --- a/Armory/anasenMS.cpp +++ b/Armory/anasenMS.cpp @@ -101,8 +101,8 @@ int main(int argc, char **argv){ transfer.SetA(27, 13, 0); // 18Ne projectile TGraph* elossBeam = LoadELoss("../ELoss/HeLoss/E_vs_x_Al-27.dat"); transfer.Seta(4, 2); // 4He target - transfer.Setb(1, 1); // outgoing proton from the primary transfer - transfer.SetB(30, 14); // 21Na* heavy product + transfer.Setb(4, 2); // outgoing proton from the primary transfer + transfer.SetB(27, 13); // 21Na* heavy product const double beamA = 27; // mass number of 27Al beam bool enableSequentialDecay = false; // turning to false to disable sequential decay for now, can be set to true to enable diff --git a/ELoss/HeLoss/E_vs_x_Al-27.dat b/ELoss/HeLoss/E_vs_x_Al-27.dat index 16c864c..5f57721 100644 --- a/ELoss/HeLoss/E_vs_x_Al-27.dat +++ b/ELoss/HeLoss/E_vs_x_Al-27.dat @@ -1,501 +1,501 @@ Distance_cm Energy_MeV --0.0 56.0 -0.052815297998978813 55.88779559118236 -0.1055905973100307 55.77559118236473 -0.1583258903802704 55.663386773547096 -0.21102116958648773 55.551182364729456 -0.2636764272343416 55.438977955911824 -0.3162916555575771 55.326773547094184 -0.3688668467171828 55.21456913827655 -0.4214019928005909 55.10236472945891 -0.47389708582081397 54.99016032064128 -0.5263521177156208 54.87795591182365 -0.5787670803466686 54.76575150300601 -0.6311419654986241 54.653547094188376 -0.6834767648783074 54.541342685370736 -0.7357714701137744 54.429138276553104 -0.7880260727534378 54.31693386773547 -0.8402405642651443 54.20472945891783 -0.8924149360352387 54.0925250501002 -0.944549179367651 53.98032064128256 -0.9966432854829212 53.86811623246493 -1.0486972455172614 53.755911823647295 -1.1007110505215727 53.643707414829656 -1.1526846914604507 53.531503006012024 -1.20461815921121 53.419298597194384 -1.2565114445628474 53.30709418837675 -1.3083645382150408 53.19488977955912 -1.3601774307771037 53.08268537074148 -1.4119501127669243 52.97048096192385 -1.463682574609925 52.85827655310621 -1.5153748066379593 52.746072144288576 -1.567026799088244 52.63386773547094 -1.6186385421022436 52.521663326653304 -1.670210025724541 52.40945891783567 -1.721741239901727 52.29725450901803 -1.7732321744812256 52.1850501002004 -1.8246828192101567 52.07284569138276 -1.8760931637341314 51.96064128256513 -1.927463197596081 51.848436873747495 -1.978792910235038 51.736232464929856 -2.0300822909849012 51.62402805611222 -2.0813313290732176 51.511823647294584 -2.1325400136198995 51.39961923847695 -2.183708333635973 51.28741482965932 -2.2348362780222772 51.17521042084168 -2.2859238355681497 51.06300601202405 -2.336970994950123 50.95080160320641 -2.387977744730558 50.838597194388775 -2.438944073356305 50.72639278557114 -2.48986996915732 50.6141883767535 -2.540755420345257 50.50198396793587 -2.591600415012079 50.38977955911823 -2.6424049411285973 50.2775751503006 -2.6931689865430437 50.16537074148297 -2.743892538979591 50.05316633266533 -2.7945755860368515 49.940961923847695 -2.8452181151863907 49.828757515030055 -2.895820113771171 49.71655310621242 -2.9463815690040245 49.60434869739479 -2.9969024679660703 49.49214428857715 -3.047382797605115 49.37993987975952 -3.097822544734061 49.26773547094188 -3.1482216960292444 49.15553106212425 -3.1985802380288035 49.043326653306615 -3.248898157130988 48.931122244488975 -3.2991754395924473 48.81891783567134 -3.34941207152653 48.7067134268537 -3.3996080389015098 48.59450901803607 -3.449763327538836 48.48230460921844 -3.4998779231113293 48.3701002004008 -3.549951811141353 48.25789579158317 -3.599984976998989 48.14569138276553 -3.649977405900146 48.033486973947895 -3.69992908290469 47.921282565130255 -3.7498399929144948 47.80907815631262 -3.7997101206715236 47.69687374749499 -3.8495394507558416 47.58466933867735 -3.8993279675836097 47.47246492985972 -3.949075655405078 47.36026052104208 -3.9987824983025053 47.24805611222445 -4.0484484801880996 47.135851703406814 -4.098073584801896 47.023647294589175 -4.147657795709606 46.91144288577154 -4.197201096300471 46.7992384769539 -4.246703469785037 46.68703406813627 -4.296164899192943 46.57482965931864 -4.345585367370656 46.462625250501 -4.394964856979166 46.350420841683366 -4.4443033504916825 46.23821643286573 -4.493600830191258 46.126012024048094 -4.542857278168415 46.01380761523046 -4.59207267631872 45.90160320641282 -4.641247006340315 45.78939879759519 -4.69038024973145 45.67719438877755 -4.7394723877879334 45.56498997995992 -4.788523401600594 45.452785571142286 -4.837533272052677 45.340581162324646 -4.886501979817199 45.228376753507014 -4.935429505354305 45.116172344689375 -4.984315828908534 45.00396793587174 -5.033160930506101 44.8917635270541 -5.081964789952087 44.77955911823647 -5.130727386827641 44.66735470941884 -5.179448700487107 44.5551503006012 -5.2281287100551115 44.442945891783566 -5.276767394423643 44.33074148296593 -5.325364732249039 44.218537074148294 -5.373920701948983 44.10633266533066 -5.422435281699426 43.99412825651302 -5.470908449431454 43.88192384769539 -5.519340182828163 43.76971943887775 -5.56773045932142 43.65751503006012 -5.616079256088642 43.545310621242486 -5.664386550049487 43.433106212424846 -5.712652317862504 43.320901803607214 -5.760876535921761 43.208697394789574 -5.809059180353383 43.09649298597194 -5.857200227012084 42.98428857715431 -5.905299651477617 42.87208416833667 -5.953357429051175 42.75987975951904 -6.00137353475177 42.6476753507014 -6.049347943312518 42.535470941883766 -6.097280629176907 42.42326653306613 -6.145171566494986 42.311062124248494 -6.193020729119503 42.19885771543086 -6.240828090602008 42.08665330661322 -6.28859362418886 41.97444889779559 -6.336317302817222 41.86224448897796 -6.383999099110961 41.75004008016032 -6.431638985376499 41.637835671342685 -6.479236933598619 41.525631262525046 -6.526792915436181 41.41342685370741 -6.5743069022178044 41.30122244488978 -6.621778864937472 41.18901803607214 -6.669208774250055 41.07681362725451 -6.716596600466817 40.96460921843687 -6.763942313550791 40.85240480961924 -6.811245883112151 40.7402004008016 -6.858507278403459 40.627995991983965 -6.905726468314888 40.51579158316633 -6.952903421369345 40.403587174348694 -7.000038105717523 40.29138276553106 -7.047130489132908 40.17917835671342 -7.0941805390066675 40.06697394789579 -7.1411882223425085 39.95476953907816 -7.188153505751427 39.84256513026052 -7.235076355446383 39.730360721442885 -7.281956737236922 39.618156312625246 -7.328794616523677 39.50595190380761 -7.375589958292823 39.39374749498998 -7.42234272711043 39.28154308617234 -7.469052887116726 39.16933867735471 -7.515720402020305 39.05713426853707 -7.562345235092199 38.94492985971944 -7.608927349159911 38.832725450901805 -7.65546670660133 38.720521042084165 -7.701963269338546 38.60831663326653 -7.748416998831609 38.49611222444889 -7.794827856072147 38.38390781563126 -7.84119580157693 38.27170340681363 -7.8875207953813105 38.15949899799599 -7.93380279703256 38.04729458917836 -7.980041765583141 37.93509018036072 -8.026237659583824 37.822885771543085 -8.072390437076756 37.710681362725445 -8.118500055588365 37.59847695390781 -8.164566472122216 37.48627254509018 -8.210589643151712 37.37406813627254 -8.256569524612697 37.26186372745491 -8.30250607189597 37.14965931863727 -8.348399239839635 37.03745490981964 -8.394248982721392 36.925250501002004 -8.44005525425066 36.813046092184365 -8.485818007560606 36.70084168336673 -8.531537195200055 36.58863727454909 -8.577212769125245 36.47643286573146 -8.622844680691497 36.36422845691383 -8.66843288064473 36.25202404809619 -8.71397731911284 36.13981963927856 -8.759477945596975 36.02761523046092 -8.804934708962643 35.915410821643285 -8.850347557430705 35.80320641282565 -8.895716438568222 35.69100200400801 -8.941041299279147 35.57879759519038 -8.986322085794903 35.46659318637274 -9.031558743664776 35.35438877755511 -9.076751217746201 35.242184368737476 -9.121899452194862 35.12997995991984 -9.167003390454646 35.017775551102204 -9.212062975247466 34.905571142284565 -9.257078148562886 34.79336673346693 -9.302048851647621 34.6811623246493 -9.346975024994844 34.56895791583166 -9.391856608333338 34.45675350701403 -9.436693540616496 34.34454909819639 -9.481485760011104 34.232344689378756 -9.526233203886006 34.120140280561124 -9.570935808800549 34.007935871743484 -9.61559351049285 33.89573146292585 -9.660206243867915 33.78352705410821 -9.704773942985517 33.67132264529058 -9.749296541047942 33.55911823647294 -9.79377397038749 33.44691382765531 -9.838206162453819 33.334709418837676 -9.882593047801073 33.222505010020036 -9.9269345560748 33.110300601202404 -9.971230615998685 32.998096192384764 -10.015481155361053 32.88589178356713 -10.059686101001184 32.7736873747495 -10.103845378795386 32.66148296593186 -10.14795891364286 32.54927855711423 -10.192026629451359 32.43707414829659 -10.236048449122583 32.324869739478956 -10.280024294537387 32.21266533066132 -10.323954086540729 32.100460921843684 -10.36783774492637 31.988256513026055 -10.411675188421379 31.87605210420842 -10.455466334670342 31.763847695390783 -10.499211100219352 31.651643286573147 -10.542909400499736 31.53943887775551 -10.58656187430735 31.42723446893788 -10.630173907648182 31.315030060120243 -10.673750236013444 31.202825651302607 -10.717291311677098 31.09062124248497 -10.760797605551154 30.978416833667335 -10.804269181920384 30.8662124248497 -10.847706070488819 30.754008016032067 -10.891108301167506 30.64180360721443 -10.93447590407696 30.529599198396795 -10.977808909549687 30.41739478957916 -11.02110734813278 30.305190380761523 -11.064371250590591 30.19298597194389 -11.107600647907484 30.080781563126255 -11.150795571290654 29.96857715430862 -11.193956052173057 29.856372745490983 -11.237082122216401 29.744168336673347 -11.280173813314253 29.63196392785571 -11.323231157595215 29.51975951903808 -11.366254187426232 29.407555110220443 -11.409242935415975 29.295350701402807 -11.452197434418341 29.18314629258517 -11.495117717536075 29.070941883767535 -11.538003818124494 28.958737474949903 -11.580855769795347 28.846533066132267 -11.62367360642079 28.73432865731463 -11.666457362137493 28.622124248496995 -11.709207071350903 28.50991983967936 -11.751922768739623 28.397715430861727 -11.794604489259967 28.28551102204409 -11.837252268150642 28.173306613226455 -11.879866140937624 28.06110220440882 -11.922446143439172 27.948897795591183 -11.964992311771045 27.83669338677355 -12.007504682351886 27.724488977955914 -12.049983291908795 27.61228456913828 -12.092428177483118 27.500080160320643 -12.134839376436423 27.387875751503007 -12.177216926456708 27.27567134268537 -12.219560865564826 27.16346693386774 -12.261871232121155 27.051262525050102 -12.304148064832493 26.939058116232466 -12.346391402759227 26.82685370741483 -12.38860128532277 26.714649298597195 -12.430777752313254 26.602444889779562 -12.472920843897542 26.490240480961926 -12.51503060062751 26.37803607214429 -12.557107063448672 26.265831663326654 -12.59915027370912 26.15362725450902 -12.641160273168797 26.041422845691383 -12.683137104009154 25.92921843687375 -12.725080808843147 25.817014028056114 -12.766991430725648 25.70480961923848 -12.808869013164244 25.592605210420842 -12.85071360013047 25.480400801603206 -12.892525236071473 25.368196392785574 -12.934303965922146 25.255991983967938 -12.976049835117731 25.143787575150302 -13.017762889606928 25.031583166332666 -13.059443175865526 24.91937875751503 -13.101090740910578 24.807174348697398 -13.142705632315142 24.694969939879762 -13.184287898223618 24.582765531062126 -13.2258375873677 24.47056112224449 -13.267354749082982 24.358356713426854 -13.308839433326224 24.24615230460922 -13.350291690693341 24.133947895791586 -13.391711572438107 24.02174348697395 -13.433099130491629 23.909539078156314 -13.474454417482638 23.797334669338678 -13.515777486758594 23.685130260521042 -13.55706839240767 23.57292585170341 -13.598327189281658 23.460721442885774 -13.639553933019803 23.348517034068138 -13.680748680073647 23.236312625250502 -13.721911487732903 23.124108216432866 -13.763042414152416 23.011903807615234 -13.804141518380243 22.899699398797598 -13.845208860386927 22.78749498997996 -13.886244501095991 22.675290581162326 -13.927248502415729 22.56308617234469 -13.96822092727234 22.450881763527054 -14.00916183964446 22.33867735470942 -14.050071304599175 22.226472945891786 -14.090949388329554 22.11426853707415 -14.131796158193788 22.002064128256514 -14.172611682756015 21.889859719438878 -14.213396031828871 21.777655310621245 -14.254149276517897 21.66545090180361 -14.294871489267825 21.553246492985974 -14.335562743910895 21.441042084168338 -14.376223115717227 21.3288376753507 -14.416852681447397 21.21663326653307 -14.457451519407284 21.104428857715433 -14.498019709505302 20.992224448897797 -14.53855733331212 20.88002004008016 -14.579064474123003 20.767815631262525 -14.619541217022855 20.655611222444893 -14.659987648954136 20.543406813627257 -14.700403858787737 20.43120240480962 -14.740789937396992 20.318997995991985 -14.781145977734926 20.20679358717435 -14.821472074914942 20.094589178356713 -14.861768326295044 19.98238476953908 -14.902034831565821 19.870180360721445 -14.942271692842311 19.75797595190381 -14.982479014759965 19.645771543086173 -15.022656904574886 19.533567134268537 -15.062805472268527 19.421362725450905 -15.102924830657098 19.30915831663327 -15.143015095505845 19.196953907815633 -15.183076385648478 19.084749498997997 -15.223108823111968 18.97254509018036 -15.263112533246959 18.860340681362725 -15.303087644864076 18.748136272545093 -15.343034290376401 18.635931863727457 -15.38295644081475 18.52372745490982 -15.422865843589294 18.411523046092185 -15.462770717047414 18.29931863727455 -15.502672438842733 18.187114228456917 -15.542572249745133 18.07490981963928 -15.582470624462971 17.962705410821645 -15.62236804180139 17.85050100200401 -15.662264991356187 17.738296593186373 -15.702161973877395 17.62609218436874 -15.742059501648013 17.513887775551105 -15.781958098878563 17.40168336673347 -15.821858302118265 17.289478957915833 -15.861760660683585 17.177274549098197 -15.901665737105002 17.065070140280564 -15.941574107592885 16.95286573146293 -15.981486362523354 16.840661322645293 -16.02140310694515 16.728456913827657 -16.061324961108514 16.61625250501002 -16.101252561017123 16.504048096192385 -16.14118655900427 16.391843687374752 -16.18112762433447 16.279639278557116 -16.221076443831688 16.16743486973948 -16.261033722535654 16.055230460921845 -16.301000184387533 15.943026052104209 -16.34097657294651 15.830821643286573 -16.38096365213885 15.718617234468939 -16.420962207041057 15.606412825651303 -16.4609730446989 15.494208416833667 -16.50099699498415 15.382004008016033 -16.54103491149097 15.269799599198397 -16.581087672474037 15.15759519038076 -16.621156181830543 15.045390781563126 -16.661241370128437 14.93318637274549 -16.701344195683316 14.820981963927855 -16.741465645686535 14.70877755511022 -16.78160673738735 14.596573146292585 -16.821768519331897 14.48436873747495 -16.861952072662184 14.372164328657314 -16.902158512478298 14.259959919839678 -16.942388989267304 14.147755511022044 -16.982644690402545 14.035551102204408 -17.022926841717194 13.923346693386774 -17.063236709156246 13.811142284569138 -17.10357560051134 13.698937875751502 -17.1439448672431 13.586733466933868 -17.18434590639596 13.474529058116232 -17.22478016261082 13.362324649298596 -17.265249130241106 13.250120240480962 -17.305754355578333 13.137915831663326 -17.346297439193513 13.02571142284569 -17.386880038401248 12.913507014028056 -17.427503869853837 12.80130260521042 -17.46817071227313 12.689098196392786 -17.50888240932846 12.57689378757515 -17.549640872669542 12.464689378757514 -17.590448085123775 12.35248496993988 -17.63130610406819 12.240280561122244 -17.67221706498683 12.12807615230461 -17.713183185225255 12.015871743486974 -17.754206767954628 11.903667334669338 -17.79529020635877 11.791462925851704 -17.836435988058575 11.679258517034068 -17.87764669978913 11.567054108216432 -17.91892503234622 11.454849699398798 -17.96027378581999 11.342645290581162 -18.00169587513492 11.230440881763526 -18.043194335916866 11.118236472945892 -18.084772330709338 11.006032064128256 -18.12643315556315 10.893827655310622 -18.16818024702527 10.781623246492986 -18.210017189554996 10.66941883767535 -18.251947723397702 10.557214428857716 -18.293975752948963 10.44501002004008 -18.336105355644623 10.332805611222446 -18.378340791415287 10.22060120240481 -18.42068651274707 10.108396793587174 -18.46314717539402 9.99619238476954 -18.505727649791545 9.883987975951904 -18.548433033224633 9.771783567134268 -18.59126866280939 9.659579158316633 -18.634240129351724 9.547374749498998 -18.677349937327634 9.435170340681362 -18.720556707457863 9.322965931863727 -18.763821201585774 9.210761523046092 -18.807143460441527 9.098557114228457 -18.850523192188298 8.986352705410821 -18.893963812948048 8.874148296593185 -18.9374693533894 8.761943887775551 -18.9810440567396 8.649739478957915 -19.024692391268403 8.537535070140281 -19.068419063605692 8.425330661322645 -19.11222903295814 8.31312625250501 -19.156127526296373 8.200921843687375 -19.20012005459077 8.08871743486974 -19.24421243018142 7.976513026052104 -19.288410785376175 7.864308617234469 -19.332721592379777 7.752104208416833 -19.377151684667407 7.639899799599198 -19.421708279927426 7.527695390781563 -19.466399004710787 7.415490981963927 -19.51123192093895 7.303286573146292 -19.55621555443816 7.191082164328657 -19.60135892568588 7.078877755511022 -19.646671582975372 6.966673346693387 -19.69216363822727 6.854468937875751 -19.73784580570246 6.742264529058116 -19.78372944389977 6.630060120240481 -19.829826600954664 6.517855711422845 -19.876150063892357 6.40565130260521 -19.922713412131046 6.293446893787575 -19.969531075679072 6.18124248496994 -20.01661839852468 6.069038076152305 -20.06399170777979 5.956833667334669 -20.111668389210962 5.844629258517034 -20.159666969873346 5.732424849699399 -20.208007208658074 5.620220440881763 -20.256710195673225 5.508016032064128 -20.305798461504796 5.395811623246493 -20.355296097550877 5.283607214428858 -20.40522888879253 5.171402805611223 -20.455624460563524 5.059198396793587 -20.50651244111299 4.946993987975952 -20.557924642027025 4.834789579158317 -20.609895258894884 4.722585170340681 -20.662461094982234 4.610380761523046 -20.7156618111199 4.498176352705411 -20.769540205545724 4.385971943887776 -20.824142528067696 4.2737675350701405 -20.879518833670392 4.161563126252505 -20.935723381591462 4.0493587174348695 -20.992815086985296 3.9371543086172345 -21.050858033610158 3.824949899799599 -21.109922057578444 3.7127454909819635 -21.170083414166925 3.6005410821643284 -21.231425542084505 3.4883366733466934 -21.294039942554154 3.376132264529058 -21.358027194231855 3.2639278557114224 -21.423498129552172 3.1517234468937874 -21.49057520381045 3.0395190380761523 -21.559394095499496 2.927314629258517 -21.63010558555564 2.8151102204408813 -21.702877774826224 2.7029058116232463 -21.77789871404056 2.5907014028056112 -21.855379539923316 2.4784969939879757 -21.93555823629466 2.3662925851703402 -22.018704172060023 2.254088176352705 -22.105123611666524 2.14188376753507 -22.195166451719505 2.0296793587174347 -22.289234515323805 1.9174749498997996 -22.387791840713213 1.8052705410821643 -22.491377543021446 1.693066132264529 -22.600622021403503 1.5808617234468938 -22.716267546088446 1.4686573146292585 -22.839194612699472 1.3564529058116233 -22.97045591382958 1.244248496993988 -23.1113203493425 1.1320440881763527 -23.26333009784264 1.0198396793587174 -23.42837407410928 0.9076352705410822 -23.60877459418035 0.7954308617234469 -23.80739893905294 0.6832264529058116 -24.023785816650847 0.5710220440881764 -24.256520336667478 0.4588176352705411 -24.507587273383727 0.3466132264529058 -24.77890950188695 0.23440881763527055 -25.067836657270067 0.12220440881763527 -25.33748895949536 0.01 +325.1827335356546 0.1 +325.0672649971565 0.24408817635270544 +324.98249305687705 0.38817635270541084 +324.90324966584774 0.5322645290581163 +324.82601301071804 0.6763527054108217 +324.7480788375612 0.8204408817635271 +324.6680851201148 0.9645290581162326 +324.58583644075856 1.1086172344689382 +324.50103037121505 1.2527054108216436 +324.41332490556863 1.3967935871743489 +324.3226847233922 1.5408817635270544 +324.22919660439084 1.68496993987976 +324.1329186122198 1.8290581162324653 +324.03389050737604 1.9731462925851706 +323.9321401387333 2.1172344689378764 +323.82768745228265 2.2613226452905817 +323.7205470572416 2.405410821643287 +323.610729899869 2.5494989979959923 +323.49824437408756 2.6935871743486977 +323.38309706990594 2.8376753507014034 +323.26529328487 2.9817635270541087 +323.14483737803897 3.125851703406814 +323.02173301782443 3.26993987975952 +322.89598335737315 3.414028056112225 +322.76759115991047 3.5581162324649305 +322.6365588891622 3.702204408817636 +322.5028887751719 3.846292585170341 +322.36658286263247 3.990380761523047 +322.22764304669124 4.134468937875752 +322.08607109971797 4.278557114228457 +321.94186869150633 4.422645290581163 +321.7950374046765 4.566733466933868 +321.6455787465476 4.7108216432865735 +321.49349415839913 4.854909819639279 +321.33878502279066 4.998997995991984 +321.1814526694276 5.14308617234469 +321.02149837993346 5.287174348697395 +320.85892339179327 5.4312625250501005 +320.6937289016648 5.575350701402806 +320.52591606820397 5.719438877755511 +320.3554860145128 5.863527054108217 +320.18243983029276 6.007615230460923 +320.006778573764 6.151703406813628 +319.82850327339685 6.295791583166333 +319.6476149294912 6.439879759519039 +319.46411451562994 6.583967935871744 +319.27800298002666 6.72805611222445 +319.08928124678397 6.872144288577155 +318.8979502170736 7.01623246492986 +318.70401077024854 7.160320641282566 +318.50746376489366 7.304408817635271 +318.308310039822 7.448496993987977 +318.1065504150202 7.592585170340682 +317.90218569254756 7.7366733466933875 +317.6952166573923 7.880761523046093 +317.4856440782867 8.024849699398798 +317.27346870848476 8.168937875751505 +317.0586912865031 8.31302605210421 +316.8413125368283 8.457114228456915 +316.6213331705911 8.60120240480962 +316.39875388620965 8.745290581162326 +316.17357537000345 8.889378757515031 +315.9457982967782 9.033466933867736 +315.7154233303842 9.177555110220442 +315.4824511242485 9.321643286573147 +315.2468823218819 9.465731462925852 +315.008717557363 9.609819639278559 +314.7679574557987 9.753907815631264 +314.5246026337632 9.897995991983969 +314.27864113701855 10.042084168336675 +314.03003106369874 10.18617234468938 +313.7787439048904 10.330260521042085 +313.52478198419965 10.47434869739479 +313.26814743581986 10.618436873747497 +313.00884236200204 10.762525050100201 +312.7468691353763 10.906613226452906 +312.48223023679765 11.050701402805613 +312.214928254569 11.194789579158318 +311.9449658837323 11.338877755511023 +311.67234531607073 11.48296593186373 +311.3970686203972 11.627054108216434 +311.11913842818296 11.77114228456914 +310.83855754885195 11.915230460921846 +310.55532888917486 12.05931863727455 +310.2694554528397 12.203406813627256 +309.9809401094684 12.347494989979962 +309.6897849284399 12.491583166332667 +309.3959921586972 12.635671342685372 +309.09956489128393 12.779759519038079 +308.80050630651226 12.923847695390783 +308.498819673649 13.067935871743488 +308.1945083506073 13.212024048096193 +307.88757576817744 13.3561122244489 +307.57802399384155 13.500200400801605 +307.26585505567056 13.64428857715431 +306.951072375402 13.788376753507016 +306.6336794569151 13.932464929859721 +306.31367988595713 14.076553106212426 +305.99107732986676 14.220641282565133 +305.6658755372936 14.364729458917838 +305.338077999323 14.508817635270542 +305.0076867791781 14.65290581162325 +304.674704220248 14.796993987975954 +304.339134113655 14.941082164328659 +304.00098032609054 15.085170340681364 +303.6602467995369 15.22925851703407 +303.3169375509824 15.373346693386775 +302.971056672131 15.51743486973948 +302.62260832910476 15.661523046092187 +302.2715952361396 15.805611222444892 +301.9180194523029 15.949699398797597 +301.56188450115286 16.093787575150305 +301.20319457157944 16.23787575150301 +300.84195392170676 16.381963927855715 +300.4781668785895 16.52605210420842 +300.11183783790284 16.670140280561125 +299.7429712636259 16.81422845691383 +299.37157168771915 16.958316633266538 +298.9976424403828 17.10240480961924 +298.62118564342234 17.246492985971948 +298.2422046259988 17.390581162324654 +297.8607039290652 17.534669338677357 +297.47668815683426 17.678757515030064 +297.09016197645036 17.82284569138277 +296.701130117656 17.966933867735474 +296.3095973724528 18.11102204408818 +295.91556859475673 18.255110220440887 +295.51904870004836 18.39919839679359 +295.1200411546743 18.543286573146297 +294.71854814828845 18.687374749499003 +294.3145733182956 18.831462925851707 +293.90812157543064 18.975551102204413 +293.4991978876833 19.11963927855712 +293.08780727994724 19.263727454909823 +292.6739548336654 19.40781563126253 +292.25764568647054 19.551903807615236 +291.83888503182163 19.69599198396794 +291.41767811863576 19.840080160320646 +290.99403025091607 19.984168336673353 +290.56794454544104 20.128256513026056 +290.13942327456857 20.272344689378762 +289.7084708900074 20.41643286573147 +289.2750926782397 20.560521042084172 +288.83929397691793 20.70460921843688 +288.4010801744978 20.848697394789582 +287.96045670986723 20.99278557114229 +287.51742907197274 21.136873747494995 +287.07200279944203 21.2809619238477 +286.62418348020395 21.425050100200405 +286.17397675110504 21.56913827655311 +285.7213882512324 21.713226452905815 +285.26642040068924 21.85731462925852 +284.8090756046526 22.001402805611228 +284.3493594730125 22.14549098196393 +283.88727766102767 22.289579158316638 +283.4228358689515 22.433667334669344 +282.9560398416551 22.577755511022048 +282.48689536824844 22.721843687374754 +282.0154082816988 22.86593186372746 +281.5415844584477 23.010020040080164 +281.06542981802545 23.15410821643287 +280.58695032266354 23.298196392785577 +280.10615197690544 23.44228456913828 +279.6230397682726 23.586372745490987 +279.13761621180606 23.730460921843694 +278.649884820712 23.874549098196397 +278.1598515604214 24.018637274549103 +277.66752243549683 24.16272545090181 +277.17290348925576 24.306813627254513 +276.6760008033921 24.45090180360722 +276.1768204975972 24.594989979959927 +275.67536872917856 24.73907815631263 +275.17165169267827 24.883166332665336 +274.66567561948966 25.027254509018043 +274.157446777473 25.171342685370746 +273.6469714705702 25.315430861723453 +273.13425603841836 25.45951903807616 +272.6193049324507 25.603607214428862 +272.10212077238884 25.74769539078157 +271.58270804168234 25.891783567134272 +271.06107302979547 26.03587174348698 +270.5372220590689 26.179959919839686 +270.01116148434846 26.32404809619239 +269.48289769261356 26.468136272545095 +268.9524371026049 26.612224448897802 +268.4197861644516 26.756312625250505 +267.884951359298 26.90040080160321 +267.34793919893013 27.04448897795592 +266.8087562254015 27.18857715430862 +266.2674090106587 27.332665330661328 +265.7239041561666 27.476753507014035 +265.1782482925337 27.620841683366738 +264.6304458616052 27.764929859719444 +264.08049958997213 27.90901803607215 +263.5284143633565 28.053106212424854 +262.9741967520518 28.19719438877756 +262.41785335302603 28.341282565130268 +261.85939078956346 28.48537074148297 +261.29881571090675 28.629458917835677 +260.7361347918989 28.773547094188384 +260.17135473262556 28.917635270541087 +259.6044822580572 29.061723446893794 +259.0355241176917 29.2058116232465 +258.4644870851968 29.349899799599203 +257.8913779580534 29.49398797595191 +257.31620355719843 29.638076152304617 +256.7389707266685 29.78216432865732 +256.1596863332438 29.926252505010027 +255.5783207614388 30.07034068136273 +254.9948033592588 30.214428857715436 +254.40909765117928 30.358517034068143 +253.82120587863702 30.502605210420846 +253.23113027813935 30.646693386773553 +252.63887308128258 30.79078156312626 +252.04443651477013 30.934869739478962 +251.4478228004306 31.07895791583167 +250.84903415523607 31.223046092184376 +250.24807279132003 31.36713426853708 +249.6449409159953 31.511222444889786 +249.0396407317722 31.655310621242492 +248.43217443637627 31.799398797595195 +247.82254422276603 31.943486973947902 +247.21075227915097 32.08757515030061 +246.59680078900917 32.23166332665331 +245.98069193110487 32.37575150300602 +245.36242787950633 32.519839679358725 +244.74200790125536 32.66392785571143 +244.11943044312468 32.80801603206413 +243.4946968289104 32.95210420841684 +242.86780917275993 33.096192384769545 +242.23876958431157 33.24028056112225 +241.6075801687115 33.38436873747496 +240.97424302663075 33.52845691382766 +240.33876025428157 33.672545090180364 +239.7011339434344 33.816633266533074 +239.06136618143455 33.96072144288578 +238.4194590512186 34.10480961923848 +237.77541463133105 34.24889779559119 +237.12923499594083 34.392985971943894 +236.48092221485774 34.5370741482966 +235.83047835354878 34.68116232464931 +235.17790547315462 34.82525050100201 +234.52320563050571 34.96933867735471 +233.86638087813859 35.11342685370742 +233.2074332643122 35.25751503006013 +232.54636236384528 35.40160320641283 +231.88316679759 35.54569138276554 +231.2178476336561 35.68977955911824 +230.5504068680094 35.833867735470946 +229.88084649249834 35.977955911823656 +229.20916849486972 36.12204408817636 +228.53537485878385 36.26613226452906 +227.85946756383015 36.41022044088177 +227.18144858554254 36.554308617234476 +226.50131989541458 36.69839679358718 +225.81908346091487 36.84248496993989 +225.1347412455023 36.98657314629259 +224.4482952086411 37.130661322645295 +223.75974730581586 37.274749498998005 +223.06909948854687 37.41883767535071 +222.37635370440475 37.56292585170341 +221.68151189702564 37.70701402805612 +220.9845760061261 37.851102204408825 +220.28554796751774 37.99519038076153 +219.58442971312212 38.13927855711424 +218.88122298833696 38.28336673346694 +218.17592658446273 38.427454909819645 +217.46853945648124 38.571543086172355 +216.75906349069058 38.71563126252506 +216.04750056963638 38.85971943887776 +215.33385257212606 39.00380761523047 +214.6181213732431 39.147895791583174 +213.90030884436092 39.29198396793588 +213.18041685315697 39.43607214428859 +212.45844726362688 39.58016032064129 +211.73440193609807 39.724248496993994 +211.00828272724382 39.868336673346704 +210.28009149009713 40.01242484969941 +209.5498300740643 40.15651302605211 +208.8175003249387 40.30060120240482 +208.08310408491457 40.44468937875752 +207.34664319260037 40.58877755511023 +206.60811948303243 40.73286573146294 +205.86753478768856 40.87695390781564 +205.12489093450125 41.02104208416834 +204.3801897478712 41.16513026052105 +203.63343304868067 41.309218436873756 +202.88462265430658 41.45330661322646 +202.13375851471406 41.59739478957916 +201.38083955259287 41.74148296593187 +200.62586653821916 41.885571142284576 +199.86884124937063 42.02965931863728 +199.10976546043702 42.17374749498999 +198.34864094243287 42.31783567134269 +197.5854694630101 42.461923847695395 +196.82025278647066 42.606012024048106 +196.0529926737793 42.75010020040081 +195.28369088257583 42.89418837675351 +194.5123491671877 43.03827655310622 +193.73896927864257 43.182364729458925 +192.96355296468047 43.32645290581163 +192.18610196976616 43.47054108216434 +191.4066180351016 43.61462925851704 +190.62510289863786 43.758717434869745 +189.84155829508742 43.902805611222455 +189.0559859559364 44.04689378757516 +188.26838760945634 44.19098196392786 +187.4787649807164 44.33507014028057 +186.68711979159528 44.479158316633274 +185.89345376079305 44.62324649298598 +185.097768603843 44.76733466933869 +184.30006603312358 44.91142284569139 +183.50034684233196 45.055511022044094 +182.69861008835247 45.199599198396804 +181.8948557295391 45.34368737474951 +181.08908544389124 45.48777555110221 +180.28130090635293 45.63186372745492 +179.47150378882432 45.77595190380762 +178.6596957601728 45.92004008016033 +177.84587848624426 46.06412825651304 +177.03005362987437 46.20821643286574 +176.2122228508996 46.35230460921844 +175.39238780616822 46.49639278557115 +174.5705501495516 46.640480961923856 +173.74671153195487 46.78456913827656 +172.920873601328 46.92865731462927 +172.09303800267674 47.07274549098197 +171.26320637807322 47.216833667334676 +170.4313803666669 47.360921843687386 +169.59756160469536 47.50501002004009 +168.76175172549475 47.64909819639279 +167.9239523595105 47.7931863727455 +167.0841651343081 47.937274549098206 +166.24239167458327 48.08136272545091 +165.39863360217268 48.22545090180362 +164.55289253606438 48.36953907815632 +163.70517009240805 48.513627254509025 +162.85546788452538 48.657715430861735 +162.0037875229205 48.80180360721444 +161.15012819698813 48.94589178356714 +160.2944890720331 49.08997995991985 +159.43687171958916 49.234068136272555 +158.57727772043634 49.37815631262526 +157.7157086526208 49.52224448897797 +156.852166091465 49.66633266533067 +155.98665160957714 49.810420841683374 +155.1191667768612 49.954509018036084 +154.2497131605267 50.09859719438879 +153.37829232509833 50.24268537074149 +152.50490583242546 50.3867735470942 +151.62955524169215 50.530861723446904 +150.75224210942625 50.67494989979961 +149.8729679895092 50.81903807615232 +148.99173443318554 50.96312625250502 +148.1085429890721 51.10721442885772 +147.2233952031676 51.25130260521043 +146.33629261886182 51.39539078156314 +145.44723677694512 51.53947895791584 +144.55622921561746 51.68356713426854 +143.66327147049768 51.82765531062125 +142.76836507463278 51.971743486973956 +141.87151155850685 52.11583166332666 +140.9727124500502 52.25991983967937 +140.07196927464864 52.40400801603207 +139.169283555152 52.548096192384776 +138.26465681188338 52.692184368737486 +137.35809056264816 52.83627254509019 +136.44958538544927 52.98036072144289 +135.53914055790327 53.1244488977956 +134.6267562845487 53.268537074148306 +133.71243405746068 53.41262525050101 +132.79617536626702 53.55671342685372 +131.87798169815684 53.70080160320642 +130.9578545378889 53.844889779559125 +130.0357953678001 53.988977955911835 +129.11180566781417 54.13306613226454 +128.18588691544977 54.27715430861724 +127.258040585829 54.42124248496995 +126.32826815168576 54.565330661322655 +125.3965710833739 54.70941883767536 +124.46295084887548 54.85350701402807 +123.52740891380917 54.99759519038077 +122.58994674143813 55.141683366733474 +121.65056579267825 55.285771543086184 +120.7092675261064 55.42985971943889 +119.76605339796816 55.57394789579159 +118.820924862186 55.7180360721443 +117.87388337036735 55.862124248497004 +116.92493037181225 56.00621242484971 +115.97406731352145 56.15030060120242 +115.02129564020427 56.29438877755512 +114.06661679428629 56.43847695390782 +113.11003221591712 56.582565130260534 +112.15154334297837 56.72665330661324 +111.19115161109106 56.87074148296594 +110.22885845362337 57.01482965931865 +109.26466530169849 57.15891783567135 +108.29857358420182 57.303006012024056 +107.33058383693036 57.44709418837677 +106.36069543155175 57.59118236472947 +105.38890862170435 57.73527054108217 +104.4152248140641 57.87935871743488 +103.4396454131283 58.023446893787586 +102.46217182122255 58.16753507014029 +101.48280543850825 58.311623246493 +100.50154766298992 58.4557114228457 +99.51839989052218 58.599799599198406 +98.53336351481698 58.743887775551116 +97.54643992745098 58.88797595190382 +96.55763051787227 59.03206412825652 +95.56693667340764 59.17615230460923 +94.57435977926974 59.320240480961935 +93.57990121856379 59.46432865731464 +92.58356237229468 59.60841683366735 +91.58534461937406 59.75250501002005 +90.58524933662693 59.896593186372755 +89.58327789879873 60.04068136272546 +88.57943167856205 60.18476953907817 +87.57371204652361 60.32885771543087 +86.5661203712308 60.472945891783574 +85.55665801917847 60.617034068136284 +84.54532635481584 60.76112224448899 +83.53212674055287 60.90521042084169 +82.517060536767 61.0492985971944 +81.50012910180997 61.193386773547104 +80.48133379201406 61.33747494989981 +79.46067596169874 61.48156312625252 +78.43815696317743 61.62565130260522 +77.4137781467636 61.76973947895792 +76.38754086077739 61.913827655310634 +75.35944645155217 62.05791583166334 +74.32949626344067 62.20200400801604 +73.29769006628273 62.34609218436875 +72.26402731312415 62.49018036072145 +71.22850902194816 62.634268537074156 +70.19113651797797 62.77835671342687 +69.151911124505 62.92244488977957 +68.1108341628948 63.06653306613227 +67.06790695259325 63.21062124248498 +66.02313081113284 63.354709418837686 +64.97650705413847 63.49879759519039 +63.92803699533359 63.6428857715431 +62.87772194654643 63.7869739478958 +61.825563217715626 63.931062124248506 +60.77156211689642 64.07515030060121 +59.715719950266454 64.21923847695392 +58.658038022131954 64.36332665330661 +57.598517634933025 64.50741482965933 +56.53716008925016 64.65150300601204 +55.47396668380977 64.79559118236473 +54.40893871548964 64.93967935871744 +53.342077479325425 65.08376753507014 +52.273384268515564 65.22785571142285 +51.202860374427694 65.37194388777556 +50.13050708660404 65.51603206412825 +49.056325692766755 65.66012024048096 +47.980317478824155 65.80420841683367 +46.90248372887602 65.94829659318637 +45.82282572521887 66.09238476953908 +44.741344748352105 66.23647294589179 +43.65804207698325 66.38056112224449 +42.57291898803311 66.5246492985972 +41.48597675664188 66.6687374749499 +40.397216656174294 66.8128256513026 +39.306639958224686 66.95691382765531 +38.21424793262305 67.10100200400802 +37.12004184744009 67.24509018036072 +36.024022968992234 67.38917835671343 +34.92619186850243 67.53326653306614 +33.82654807780598 67.67735470941884 +32.725091815578125 67.82144288577155 +31.621824331645897 67.96553106212426 +30.516746874122493 68.10961923847695 +29.409860689412074 68.25370741482966 +28.30116702221558 68.39779559118237 +27.190667115535504 68.54188376753507 +26.078362210680652 68.68597194388778 +24.964253547271863 68.83006012024049 +23.848342363246736 68.97414829659319 +22.73062989486431 69.1182364729459 +21.611117376710716 69.2623246492986 +20.489806041703826 69.4064128256513 +19.366697121097864 69.55050100200401 +18.241791844489008 69.69458917835672 +17.11509143981995 69.83867735470942 +15.986597133384446 69.98276553106213 +14.856310149832847 70.12685370741484 +13.724231712176598 70.27094188376753 +12.590363041792715 70.41503006012024 +11.454705358429253 70.55911823647295 +10.317259880209734 70.70320641282565 +9.178027823637565 70.84729458917836 +8.037010403601432 70.99138276553107 +6.894208833379669 71.13547094188377 +5.749624324644608 71.27955911823648 +4.6032580874679105 71.42364729458919 +3.4551113303248715 71.56773547094188 +2.3051852600987006 71.7118236472946 +1.1534810820858008 71.8559118236473 +-0.0 72.0 diff --git a/ELoss/PCEnergyAnalysis.py b/ELoss/PCEnergyAnalysis.py index 1c6f9a4..04240d9 100644 --- a/ELoss/PCEnergyAnalysis.py +++ b/ELoss/PCEnergyAnalysis.py @@ -5,6 +5,7 @@ Created on Wed May 20 13:32:14 2026 @author: jamesszalkie """ +import gc import numpy as np import pandas as pd from scipy.interpolate import interp1d @@ -74,6 +75,13 @@ particles = { interp_cache = {} +def clear_interpolator_cache(): + """Drop cached energy-loss interpolators and force Python to release memory.""" + global interp_cache + interp_cache.clear() + gc.collect() + + def make_E_vs_x( z, mass_u, @@ -121,7 +129,7 @@ def make_E_vs_x( if z == 2: rho_g_cm3 = 0.00017 #rho_g_cm3 = 8.2928e-5 - if z == 1: + else: rho_g_cm3 = 8.2928e-5 gas = catima.Material(material_def) @@ -164,6 +172,7 @@ def make_E_vs_x( print(f"[INFO] saved: {outfile}") interp_cache.pop((label.lower(), medium.lower()), None) + gc.collect() return x, E @@ -365,7 +374,7 @@ def prepare_tree_data(tree, treename, particle, max_events=None, z_max=34.86): radii = np.array([3.7, 4.3]) dA = (radii[0] - np.sqrt((vXsx3/10)**2 + (vYsx3/10)**2))/ sin_theta dC = (radii[1] - np.sqrt((vXsx3/10)**2 + (vYsx3/10)**2))/ sin_theta - lsx3 = (0.1 / sin_theta) * 10 + lsx3 = (.1 / sin_theta) # Filter out unphysical distances (negative or unreasonably small) # These typically occur at large angles where trajectory doesn't properly intersect proportional counters @@ -386,13 +395,16 @@ def prepare_tree_data(tree, treename, particle, max_events=None, z_max=34.86): print(f"Computing energies for {particle} ({treename})...") #print(f" Retained {np.sum(distance_mask)} / {len(distance_mask)} events after distance filter") + clear_interpolator_cache() EA = energy_loss(particle, "He", Eisx3, dA) EC = energy_loss(particle, "He", Eisx3, dC) Esx3 = energy_loss(particle, "He", Eisx3, dsx3) Eqqq = energy_loss(particle, "He", Eiqqq, dqqq) + + clear_interpolator_cache() Efinal = energy_loss(particle, "Si", Esx3, lsx3) - - Edet = np.where(Efinal <= 0, Esx3, Esx3 - Efinal) + Edet = Esx3 - Efinal + #Edet = np.where(Efinal <= 0, Esx3, Esx3 - Efinal) Elost = Eisx3 - Esx3 Elostqqq = Eiqqq - Eqqq @@ -421,19 +433,24 @@ def prepare_tree_data(tree, treename, particle, max_events=None, z_max=34.86): "Edet": Edet } +def infer_particle_from_filename(filename): + lower = os.path.basename(filename).lower() + if "proton" in lower: + return "proton" + if "alpha" in lower: + return "alpha" + if "deuteron" in lower: + return "deuteron" + return None + + def process_file(filename, treename, particle=None, max_events=None): tree = uproot.open(filename)[f"{treename}"] if particle is None: - lower = filename.lower() - if "proton" in lower: - particle = "proton" - elif "alpha" in lower: - particle = "alpha" - elif "deuteron" in lower: - particle = "deuteron" - else: - particle = "proton" + particle = infer_particle_from_filename(filename) + if particle is None: + particle = "proton" print(f"File {filename} particle {particle}, tree {treename}") return prepare_tree_data(tree, treename, particle, max_events=max_events) @@ -1281,13 +1298,7 @@ class MyInteractiveApp(cmd.Cmd): plt.show() except ValueError: print("Value error") - - #try: - - #except ValueError: - # print("Value error") - - + branch_names = [] for key in self.tree.keys(): if isinstance(key, bytes): @@ -1301,9 +1312,6 @@ class MyInteractiveApp(cmd.Cmd): if branch_names: print(f"Creating histograms for {len(branch_names)} branches...") all_branches = self.tree.arrays(branch_names, library="np", entry_stop=max_events) - - # Keep only events with thetab >= 45 - #mask = (all_branches["Tb"] > 0) & (all_branches["qqqTb"] > 0) for branch in branch_names: values = all_branches[branch] @@ -1341,8 +1349,6 @@ class MyInteractiveApp(cmd.Cmd): else: print("No branches found to histogram.") - - print(f"Plotting complete ({treename}).") def do_hist_comp(self, arg): @@ -1360,7 +1366,6 @@ class MyInteractiveApp(cmd.Cmd): else: branch_names.append(str(key)) branch_names = list(dict.fromkeys(branch_names)) - print(branch_names) if branch_names: @@ -1401,7 +1406,6 @@ class MyInteractiveApp(cmd.Cmd): else: print("No branches found to histogram.") - def do_dual_plotter(self, arg): args = shlex.split(arg) @@ -1425,21 +1429,25 @@ class MyInteractiveApp(cmd.Cmd): for file in files: try: - # If you want to combine tree1 + tree2: + resolved_path = os.path.join("..", "Armory", file) + resolved_particle = infer_particle_from_filename(resolved_path) + tree1 = process_file( - os.path.join("..", "Armory", file), - "tree1" + resolved_path, + "tree1", + particle=resolved_particle ) try: tree2 = process_file( - os.path.join("..", "Armory", file), - "tree2" + resolved_path, + "tree2", + particle=resolved_particle ) data = { "particle": - f"{tree1['particle']}_combined" + f"{resolved_particle or tree1['particle']}_combined" } for key in tree1: @@ -1474,8 +1482,9 @@ class MyInteractiveApp(cmd.Cmd): plt.figure(figsize=(8, 6)) for data in datasets: + dep_values = data.get("Edet", data.get("Elost", [])) plt.hist( - data["Elost"], + dep_values, bins=200, histtype="step", linewidth=2, @@ -1483,15 +1492,15 @@ class MyInteractiveApp(cmd.Cmd): label=data["particle"] ) - plt.xlabel("Energy Loss (MeV)") + plt.xlabel("Energy Deposition (MeV)") plt.ylabel("Normalized Counts") - plt.title("Energy Loss Comparison") + plt.title("Energy Deposition Comparison") plt.legend() plt.grid(True) plt.tight_layout() plt.savefig( - f"{outdir}/Elost_overlay.png", + f"{outdir}/Edet_overlay.png", dpi=300 ) @@ -1536,18 +1545,19 @@ class MyInteractiveApp(cmd.Cmd): for ax, data in zip(axes, datasets): + dep_values = data.get("Edet", data.get("Elost", [])) h = ax.hist2d( data["sx3Z"], - data["Elost"], + dep_values, bins=200 ) ax.set_title( - f'{data["particle"]}\nElost vs SX3' + f'{data["particle"]}\nEnergy Deposition vs SX3' ) ax.set_xlabel("SX3 Z") - ax.set_ylabel("Energy Loss (MeV)") + ax.set_ylabel("Energy Deposition (MeV)") fig.colorbar( h[3], @@ -1558,11 +1568,40 @@ class MyInteractiveApp(cmd.Cmd): plt.tight_layout() plt.savefig( - f"{outdir}/Elost_vs_sx3_comparison.png", + f"{outdir}/Edet_vs_sx3_comparison.png", dpi=300 ) plt.show() + + for data in datasets: + mask = ( + ~np.isnan(data.get("Edet", [])) & + (data.get("Edet", []) > 0) & + ~np.isnan(data.get("Eprop", [])) & + ~np.isnan(data.get("thetab", [])) + ) + if not np.any(mask): + print(f"No valid events for {data['particle']} when plotting Eprop vs Edet.") + continue + + x = np.asarray(data["Edet"])[mask] + y = np.asarray(data["Eprop"])[mask] * np.asarray(data["thetab"])[mask] + + plt.figure(figsize=(7, 6)) + plt.hist2d(x, y, bins=200) + plt.ylabel("PCEnergy") + plt.xlabel("SX3 Energy Detected (MeV)") + plt.title(f"{data['particle']} Energy Propagation Difference vs SX3 Energy Detected") + plt.colorbar(label="Counts") + plt.tight_layout() + + safe_name = re.sub(r"[^0-9A-Za-z_-]", "_", data["particle"]) + plt.savefig( + f"{outdir}/{safe_name}_Eprop_vs_Edet.png", + dpi=300 + ) + plt.show() plt.figure(figsize=(8, 6)) @@ -1592,29 +1631,26 @@ class MyInteractiveApp(cmd.Cmd): all_Esx3 = [] all_Eprop = [] - all_Edet = [] + all_Edet = [] for data in datasets: - - mask = data["Esx3"] > 1 - - thetab = np.deg2rad( - data["thetab"][mask] + mask = ( + ~np.isnan(data["Edet"]) + & (data["Edet"] > 0) + & ~np.isnan(data["Eprop"]) + & ~np.isnan(data["thetab"]) ) - + thetab = data["thetab"][mask] all_Esx3.append( data["Esx3"][mask] ) - all_Eprop.append( data["Eprop"][mask] - * np.sin(thetab) - * 3 + * thetab ) - all_Edet.append( data["Edet"][mask] - * np.sin(thetab)) + ) combined_Esx3 = np.concatenate(all_Esx3) combined_Eprop = np.concatenate(all_Eprop) @@ -1660,6 +1696,7 @@ class MyInteractiveApp(cmd.Cmd): ) plt.xlabel("SX3 Energy Deposition (MeV)") plt.ylabel("PCEnergy x Sin(theta)") + plt.title("PCEnergy vs Energy Deposition in sx3") plt.colorbar(label="Counts") plt.tight_layout() plt.savefig( @@ -1705,8 +1742,6 @@ class MyInteractiveApp(cmd.Cmd): f"Completed plotting " f"{len(datasets)} datasets." ) - -#exec(open("PCEnergyAnalysis.py").read()) if __name__ == "__main__": MyInteractiveApp().cmdloop() diff --git a/ELoss/SiLoss/E_vs_x_alpha.dat b/ELoss/SiLoss/E_vs_x_alpha.dat index 61c7e19..2ac4d83 100644 --- a/ELoss/SiLoss/E_vs_x_alpha.dat +++ b/ELoss/SiLoss/E_vs_x_alpha.dat @@ -1,501 +1,501 @@ Distance_cm Energy_MeV -0.0052592906193615965 0.1 -0.005256548760366959 0.10981963927855712 -0.005253813942426374 0.11963927855711423 -0.005251076075550516 0.12945891783567134 -0.005248327436122693 0.13927855711422846 -0.005245562072251752 0.14909819639278557 -0.005242775375898601 0.1589178356713427 -0.005239963768008947 0.16873747494989982 -0.0052371244627769575 0.17855711422845694 -0.0052342552888350775 0.18837675350701405 -0.005231354552299548 0.19819639278557116 -0.005228420931128786 0.20801603206412828 -0.005225453393225606 0.2178356713426854 -0.005222451132730192 0.2276553106212425 -0.00521941352035695 0.23747494989979961 -0.005216340064634455 0.24729458917835673 -0.005213230381643349 0.25711422845691384 -0.005210084171394999 0.26693386773547095 -0.0052069011994078035 0.27675350701402807 -0.005203681282354828 0.2865731462925852 -0.0052004242769009 0.2963927855711423 -0.005197130071037272 0.3062124248496994 -0.005193798577370305 0.3160320641282565 -0.005190429727936938 0.32585170340681363 -0.005187023470211062 0.3356713426853708 -0.005183579764036811 0.3454909819639279 -0.005180098579281475 0.355310621242485 -0.005176579894045341 0.36513026052104214 -0.005173023693301013 0.37494989979959925 -0.005169429967862482 0.38476953907815636 -0.005165798713606087 0.3945891783567135 -0.005162129930882717 0.4044088176352706 -0.005158423624074152 0.4142284569138277 -0.005154679801257077 0.4240480961923848 -0.005150898473946656 0.43386773547094193 -0.005147079656898115 0.44368737474949904 -0.00514322336794987 0.45350701402805615 -0.005139329627895782 0.46332665330661327 -0.005135398460377175 0.4731462925851704 -0.0051314298917877164 0.4829659318637275 -0.005127423951186091 0.4927855711422846 -0.005123380670212857 0.5026052104208417 -0.00511930008300895 0.5124248496993988 -0.005115182226134147 0.522244488977956 -0.00511102713848443 0.5320641282565131 -0.005106834861207642 0.5418837675350702 -0.0051026054376171835 0.5517034068136273 -0.00509833891310374 0.5615230460921844 -0.005094035335045194 0.5713426853707415 -0.005089694752714996 0.5811623246492986 -0.00508531721718935 0.5909819639278557 -0.005080902781253586 0.6008016032064128 -0.005076451499308135 0.61062124248497 -0.005071963427274492 0.6204408817635271 -0.005067438622501573 0.6302605210420842 -0.005062877143672814 0.6400801603206413 -0.005058279050714358 0.6498997995991984 -0.00505364440470464 0.6597194388777555 -0.005048973267785634 0.6695390781563126 -0.005044265703076013 0.6793587174348698 -0.005039521774586427 0.6891783567134269 -0.005034741547137075 0.698997995991984 -0.005029925086277724 0.7088176352705411 -0.0050250724582102954 0.7186372745490982 -0.005020183729714108 0.7284569138276553 -0.005015258968073855 0.7382765531062124 -0.005010298241010367 0.7480961923847695 -0.00500530161661418 0.7579158316633267 -0.005000269163281941 0.7677354709418838 -0.004995200949655631 0.7775551102204409 -0.004990097044564602 0.787374749498998 -0.004984957516970395 0.7971943887775551 -0.004979782435914307 0.8070140280561122 -0.004974571870467649 0.8168336673346693 -0.004969325889684659 0.8266533066132264 -0.004964044562557995 0.8364729458917836 -0.004958727957976745 0.8462925851703407 -0.004953376144686894 0.8561122244488978 -0.00494798919125416 0.8659318637274549 -0.004942567166029134 0.875751503006012 -0.004937110137114648 0.8855711422845691 -0.0049316181723352785 0.8953907815631262 -0.00492609133920892 0.9052104208416833 -0.004920529704920346 0.9150300601202405 -0.0049149333362966665 0.9248496993987976 -0.004909302299784622 0.9346693386773547 -0.00490363666142962 0.9444889779559118 -0.004897936486856439 0.9543086172344689 -0.004892201841251538 0.964128256513026 -0.004886432789346874 0.9739478957915831 -0.00488062939540518 0.9837675350701403 -0.0048747917232066125 0.9935871743486974 -0.0048689198360367105 1.0034068136272545 -0.0048630137966756 1.0132264529058117 -0.00485707366738837 1.0230460921843687 -0.004851099509916574 1.032865731462926 -0.004845091385470772 1.0426853707414832 -0.004839049354724087 1.0525050100200402 -0.004832973477806687 1.0623246492985974 -0.00482686381430117 1.0721442885771544 -0.004820720423238764 1.0819639278557116 -0.004814543363096337 1.0917835671342686 -0.004808332691794127 1.1016032064128258 -0.0048020884666941785 1.1114228456913828 -0.004795810744599414 1.12124248496994 -0.004789499581753336 1.131062124248497 -0.00478315503384027 1.1408817635270543 -0.004776777155986167 1.1507014028056113 -0.00477036600275988 1.1605210420841685 -0.004763921628174911 1.1703406813627255 -0.004757444085691586 1.1801603206412827 -0.004750933428219624 1.1899799599198397 -0.004744389708121076 1.199799599198397 -0.004737812977213606 1.209619238476954 -0.004731203286774083 1.2194388777555112 -0.0047245606875424605 1.2292585170340682 -0.004717885229725927 1.2390781563126254 -0.0047111769630032935 1.2488977955911824 -0.004704435936529599 1.2587174348697396 -0.00469766219894093 1.2685370741482966 -0.004690855798359406 1.2783567134268539 -0.004684016782398344 1.2881763527054109 -0.0046771451981675585 1.297995991983968 -0.004670241092278802 1.307815631262525 -0.004663304510851317 1.3176352705410823 -0.004656335499517493 1.3274549098196393 -0.004649334103428611 1.3372745490981965 -0.0046423003672606674 1.3470941883767535 -0.004635234335220262 1.3569138276553108 -0.004628136051050541 1.366733466933868 -0.00462100555803718 1.376553106212425 -0.00461384289901441 1.3863727454909822 -0.004606648116371062 1.3961923847695392 -0.004599421252056631 1.4060120240480964 -0.0045921623475873525 1.4158316633266534 -0.004584871444052275 1.4256513026052107 -0.0045775485821193335 1.4354709418837677 -0.004570193802041411 1.445290581162325 -0.004562807143662382 1.455110220440882 -0.004555388646423133 1.4649298597194391 -0.004547938349367564 1.4747494989979961 -0.004540456291148543 1.4845691382765533 -0.004532942510033841 1.4943887775551103 -0.0045253970439120186 1.5042084168336676 -0.0045178199302982665 1.5140280561122246 -0.004510211206340209 1.5238476953907818 -0.004502570908823647 1.5336673346693388 -0.004494899074178258 1.543486973947896 -0.004487195738483234 1.553306613226453 -0.004479460937472864 1.5631262525050102 -0.004471694706542063 1.5729458917835673 -0.004463897080751828 1.5827655310621245 -0.004456068094834644 1.5925851703406815 -0.004448207783199819 1.6024048096192387 -0.004440316179938754 1.6122244488977957 -0.004432393318830145 1.622044088176353 -0.004424439233345127 1.63186372745491 -0.004416453956652334 1.6416833667334672 -0.004408437521622904 1.6515030060120242 -0.004400389960835409 1.6613226452905814 -0.004392311306580712 1.6711422845691384 -0.00438420159086676 1.6809619238476956 -0.0043760608454233045 1.6907815631262526 -0.004367889101706547 1.7006012024048098 -0.004359686390903719 1.7104208416833668 -0.004351452743937591 1.720240480961924 -0.00434318819147091 1.730060120240481 -0.0043348927639107636 1.7398797595190383 -0.004326566491412882 1.7496993987975953 -0.0043182094038858605 1.7595190380761525 -0.004309821530995321 1.7693386773547095 -0.004301402902167999 1.7791583166332667 -0.004292953546595768 1.7889779559118237 -0.0042844734932395885 1.798797595190381 -0.004275962770833396 1.808617234468938 -0.004267421407887918 1.8184368737474952 -0.004258849432694431 1.8282565130260522 -0.00425024687332844 1.8380761523046094 -0.004241613757653309 1.8478957915831664 -0.004232950113323814 1.8577154308617236 -0.00422425596778964 1.8675350701402806 -0.0042155313482988115 1.8773547094188379 -0.004206776281901066 1.8871743486973949 -0.0041979907954511585 1.896993987975952 -0.004189174915612116 1.906813627254509 -0.0041803286688584206 1.9166332665330663 -0.0041714520814791455 1.9264529058116233 -0.004162545179581024 1.9362725450901805 -0.004153607989091466 1.9460921843687375 -0.004144640535761517 1.9559118236472948 -0.004135642845168764 1.9657314629258518 -0.00412661494272018 1.975551102204409 -0.004117556853654925 1.9853707414829662 -0.004108468603047083 1.9951903807615232 -0.004099350215808357 2.00501002004008 -0.004090201716690703 2.0148296593186372 -0.0040810231302889225 2.0246492985971947 -0.0040718144810432 2.0344689378757517 -0.004062575793241592 2.0442885771543087 -0.004053307091022471 2.0541082164328657 -0.0040440083983769165 2.063927855711423 -0.00403467973915107 2.07374749498998 -0.004025321137048432 2.083567134268537 -0.004015932615632119 2.093386773547094 -0.004006514198327083 2.1032064128256516 -0.00399706590842228 2.1130260521042086 -0.003987587769072796 2.1228456913827656 -0.003978079803301934 2.132665330661323 -0.003968542034003265 2.14248496993988 -0.003958974483942624 2.152304609218437 -0.003949377175760086 2.162124248496994 -0.003939750131971884 2.1719438877755515 -0.003930093374972305 2.1817635270541085 -0.003920406927035538 2.1915831663326655 -0.003910690810317491 2.2014028056112225 -0.0039009450468575685 2.21122244488978 -0.0038911696585804184 2.221042084168337 -0.003881364667297638 2.230861723446894 -0.0038715300947094523 2.240681362725451 -0.0038616659624063536 2.2505010020040084 -0.003851772291870715 2.2603206412825654 -0.0038418491044783635 2.2701402805611224 -0.00383189642150013 2.2799599198396794 -0.003821914264103362 2.289779559118237 -0.0038119026533534116 2.299599198396794 -0.0038018616102150882 2.309418837675351 -0.003791791155554088 2.319238476953908 -0.00378169131013839 2.3290581162324653 -0.0037715620946396295 2.3388777555110223 -0.0037614035296344383 2.3486973947895793 -0.0037512156356057625 2.3585170340681363 -0.0037409984329441525 2.3683366733466937 -0.0037307519419490284 2.3781563126252507 -0.0037204761828299178 2.3879759519038077 -0.0037101711757076715 2.3977955911823647 -0.003699836940615653 2.407615230460922 -0.0036894734975009076 2.417434869739479 -0.0036790808662253032 2.427254509018036 -0.0036686590665666527 2.437074148296593 -0.0036582081182198116 2.4468937875751506 -0.003647728040797757 2.4567134268537076 -0.0036372188538326394 2.4665330661322646 -0.003626680576776821 2.4763527054108216 -0.0036161132290038855 2.486172344689379 -0.0036055168298096373 2.495991983967936 -0.0035948913984130697 2.505811623246493 -0.003584236953957324 2.51563126252505 -0.003573553515510623 2.5254509018036075 -0.0035628411020671917 2.5352705410821645 -0.0035520997325481527 2.5450901803607215 -0.0035413294258024104 2.5549098196392785 -0.003530530200607514 2.564729458917836 -0.003519702075670507 2.574549098196393 -0.0035088450696287555 2.58436873747495 -0.003497959201050763 2.594188376753507 -0.0034870444884369687 2.6040080160320644 -0.0034761009502205327 2.6138276553106214 -0.0034651286047680994 2.6236472945891784 -0.0034541274703805518 2.633466933867736 -0.003443097565293751 2.643286573146293 -0.003432038907679257 2.65310621242485 -0.003420951515645038 2.662925851703407 -0.0034098354072361675 2.6727454909819643 -0.0033986906004355062 2.6825651302605213 -0.0033875171131643694 2.6923847695390783 -0.003376314963283184 2.7022044088176354 -0.003365084168592131 2.712024048096193 -0.003353824746831778 2.72184368737475 -0.0033425367156836947 2.731663326653307 -0.0033312200927710627 2.741482965931864 -0.0033198748956592694 2.7513026052104212 -0.003308501141856493 2.7611222444889783 -0.0032970988488142724 2.7709418837675353 -0.003285668033928072 2.7807615230460923 -0.00327420871453783 2.7905811623246497 -0.003262720907928503 2.8004008016032067 -0.0032512046313305904 2.8102204408817637 -0.0032396599019206603 2.8200400801603207 -0.003228086736821857 2.829859719438878 -0.0032164851531044027 2.839679358717435 -0.0032048551677860897 2.849498997995992 -0.003193196797832761 2.859318637274549 -0.003181510060158784 2.8691382765531066 -0.003169794971627518 2.8789579158316636 -0.003158051549051766 2.8887775551102206 -0.0031462798091942234 2.8985971943887776 -0.0031344797687679177 2.908416833667335 -0.0031226514444366404 2.918236472945892 -0.0031107948528153674 2.928056112224449 -0.0030989100104706767 2.937875751503006 -0.0030869969339211542 2.9476953907815635 -0.0030750556396377973 2.9575150300601205 -0.003063086144044404 2.9673346693386775 -0.0030510884635179614 2.9771543086172345 -0.0030390626143890227 2.986973947895792 -0.003027008612942083 2.996793587174349 -0.003014926475415939 3.006613226452906 -0.0030028162180040533 3.016432865731463 -0.002990677856854903 3.0262525050100204 -0.0029785114080723304 3.0360721442885774 -0.0029663168877158766 3.0458917835671344 -0.002954094311801122 3.0557114228456914 -0.00294184369630001 3.065531062124249 -0.002929565057141173 3.075350701402806 -0.0029172584102102467 3.085170340681363 -0.002904923771350182 3.09498997995992 -0.00289256115636155 3.1048096192384773 -0.0028801705810028474 3.1146292585170343 -0.002867752060990785 3.1244488977955913 -0.0028553056120005815 3.1342685370741483 -0.002842831249666251 3.1440881763527058 -0.0028303289895808804 3.1539078156312628 -0.0028177988472969065 3.1637274549098198 -0.0028052408383263876 3.1735470941883768 -0.0027926549781412684 3.183366733466934 -0.002780041282173646 3.193186372745491 -0.0027673997658160233 3.203006012024048 -0.0027547304444215655 3.2128256513026052 -0.0027420333333043477 3.2226452905811627 -0.0027293084477396034 3.2324649298597197 -0.002716555802963962 3.2422845691382767 -0.0027037754141756875 3.252104208416834 -0.002690967296534915 3.261923847695391 -0.002678131465163875 3.271743486973948 -0.0026652679351471253 3.281563126252505 -0.0026523767215317685 3.2913827655310626 -0.0026394578393276764 3.3012024048096196 -0.0026265113035077 3.3110220440881766 -0.0026135371290078864 3.3208416833667336 -0.002600535330727684 3.330661322645291 -0.0025875059235301525 3.340480961923848 -0.0025744489222421607 3.350300601202405 -0.002561364341654589 3.360120240480962 -0.0025482521965225252 3.3699398797595195 -0.002535112501565458 3.3797595190380765 -0.002521945271467467 3.3895791583166335 -0.0025087505208774103 3.3993987975951905 -0.00249552826440911 3.409218436873748 -0.0024822785166415356 3.419038076152305 -0.0024690012921189802 3.428857715430862 -0.0024556966053512403 3.438677354709419 -0.0024423644708137884 3.4484969939879764 -0.002429004902947947 3.4583166332665334 -0.002415617916161056 3.4681362725450904 -0.0024022035248266395 3.4779559118236474 -0.0023887617432845716 3.487775551102205 -0.0023752925858412394 3.497595190380762 -0.002361796066769701 3.507414829659319 -0.0023482722003098444 3.517234468937876 -0.0023347210006685426 3.5270541082164333 -0.0023211424820198095 3.5368737474949903 -0.0023075366585049487 3.5466933867735473 -0.002293903544232704 3.5565130260521043 -0.0022802431532794065 3.5663326653306617 -0.002266555499689122 3.5761523046092187 -0.002252840597473792 3.5859719438877757 -0.0022390984606133774 3.5957915831663327 -0.0022253291030559963 3.60561122244489 -0.0022115325387180667 3.615430861723447 -0.0021977087814844375 3.625250501002004 -0.0021838578452085264 3.635070140280561 -0.0021699797437124517 3.6448897795591186 -0.0021560744907871657 3.6547094188376756 -0.0021421421001925813 3.6645290581162326 -0.0021281825856577026 3.6743486973947896 -0.00211419596088075 3.684168336673347 -0.0021001822395292882 3.693987975951904 -0.002086141435240346 3.703807615230461 -0.002072073561620541 3.713627254509018 -0.002057978632246199 3.7234468937875755 -0.002043856660663477 3.7332665330661325 -0.002029707660388475 3.7430861723446895 -0.002015531644907358 3.7529058116232465 -0.002001328627676468 3.762725450901804 -0.0019870986221224417 3.772545090180361 -0.0019728416416423204 3.782364729458918 -0.001958557699603662 3.792184368737475 -0.0019442468093446516 3.8020040080160324 -0.0019299089841742134 3.8118236472945894 -0.0019155442373721143 3.8216432865731464 -0.0019011525821890738 3.8314629258517034 -0.0018867340318468682 3.841282565130261 -0.0018722885995384382 3.851102204408818 -0.001857816298427989 3.860921843687375 -0.0018433171416510942 3.8707414829659323 -0.0018287911423148003 3.8805611222444893 -0.0018142383134977225 3.8903807615230463 -0.0017996586682501473 3.9002004008016034 -0.0017850522195941299 3.910020040080161 -0.0017704189805235946 3.919839679358718 -0.0017557589640044278 3.929659318637275 -0.001741072182974576 3.939478957915832 -0.0017263586503441402 3.9492985971943892 -0.0017116183789954722 3.9591182364729463 -0.001696851381783264 3.9689378757515033 -0.0016820576715346426 3.9787575150300603 -0.0016672372610492614 3.9885771543086177 -0.0016523901630993926 3.9983967935871747 -0.0016375163904300133 4.008216432865732 -0.0016226159557588987 4.018036072144288 -0.0016076888717767063 4.027855711422846 -0.0015927351511470695 4.037675350701403 -0.0015777548065066818 4.04749498997996 -0.0015627478504653782 4.057314629258517 -0.00154771429560623 4.067134268537075 -0.0015326541544856249 4.076953907815631 -0.0015175674396333471 4.086773547094189 -0.0015024541635526715 4.096593186372745 -0.0014873143387204343 4.106412825651303 -0.0014721479775871274 4.116232464929859 -0.0014569550925769685 4.126052104208417 -0.0014417356960879917 4.135871743486974 -0.0014264898004921246 4.145691382765531 -0.0014112174181352632 4.155511022044088 -0.0013959185613373597 4.1653306613226455 -0.001380593242392498 4.175150300601202 -0.0013652414735689663 4.1849699398797595 -0.0013498632671093453 4.194789579158316 -0.001334458635230574 4.2046092184368735 -0.0013190275901240364 4.214428857715431 -0.0013035701439556323 4.2242484969939875 -0.0012880863088658501 4.234068136272545 -0.0012725760969698493 4.243887775551102 -0.0012570395203575309 4.253707414829659 -0.0012414765910936075 4.263527054108216 -0.001225887321217687 4.273346693386773 -0.0012102717227443337 4.28316633266533 -0.001194629807663152 4.292985971943888 -0.0011789615879388535 4.302805611222444 -0.0011632670755113246 4.312625250501002 -0.001147546282295707 4.322444889779559 -0.0011317992201824636 4.332264529058116 -0.001116025901037446 4.342084168336673 -0.0011002263367019727 4.35190380761523 -0.0010844005389928895 4.361723446893787 -0.0010685485197026476 4.371543086172345 -0.001052670290599368 4.381362725450901 -0.001036765863426907 4.391182364729459 -0.0010208352499049317 4.401002004008016 -0.0010048784617289843 4.410821643286573 -0.000988895510570545 4.42064128256513 -0.0009728864080771096 4.430460921843687 -0.0009568511658722434 4.440280561122244 -0.0009407897955556596 4.450100200400802 -0.0009247023087032793 4.459919839679358 -0.0009085887168672941 4.469739478957916 -0.0008924490315762398 4.479559118236473 -0.0008762832643350567 4.48937875751503 -0.0008600914266251507 4.499198396793587 -0.0008438735299044659 4.509018036072145 -0.0008276295856075447 4.518837675350701 -0.0008113596051455875 4.528657314629259 -0.0007950635999065256 4.538476953907815 -0.0007787415812550738 4.548296593186373 -0.0007623935605328027 4.55811623246493 -0.0007460195490581976 4.567935871743487 -0.0007296195581267161 4.577755511022044 -0.0007131935990108595 4.5875751503006015 -0.0006967416829602295 4.597394789579158 -0.000680263821201586 4.6072144288577155 -0.0006637600249389184 4.617034068136272 -0.0006472303053534951 4.6268537074148295 -0.0006306746736039344 4.636673346693387 -0.0006140931408262603 4.6464929859719435 -0.0005974857181339592 4.656312625250501 -0.0005808524166180481 4.666132264529058 -0.0005641932473471302 4.675951903807615 -0.00054750822136745 4.685771543086172 -0.000530797349702963 4.695591182364729 -0.0005140606433553829 4.705410821643286 -0.0004972981133042507 4.715230460921844 -0.00048050977050698927 4.7250501002004 -0.00046369562589895693 4.734869739478958 -0.0004468556903935147 4.744689378757515 -0.0004299899748820798 4.754509018036072 -0.00041309849023417886 4.764328657314629 -0.00039618124729751597 4.774148296593186 -0.00037923825689801794 4.783967935871743 -0.0003622695298399022 4.793787575150301 -0.0003452750769057288 4.803607214428857 -0.0003282549088564528 4.813426853707415 -0.00031120903643149005 4.823246492985972 -0.0002941374703487686 4.833066132264529 -0.00027704022130478037 4.842885771543086 -0.00025991729997464785 4.852705410821643 -0.0002427687170121675 4.8625250501002 -0.00022559448304987605 4.872344689378758 -0.0002083946086991013 4.882164328657314 -0.00019116910455001257 4.891983967935872 -0.00017391798117168496 4.901803607214429 -0.00015664124911214964 4.911623246492986 -0.00013933891889844366 4.921442885771543 -0.0001220110010366754 4.9312625250501 -0.00010465750601206631 4.941082164328657 -8.727844428901596e-05 4.9509018036072145 -6.98738263111513e-05 4.960721442885771 -5.244366250137568e-05 4.9705410821643286 -3.498796326193187e-05 4.980360721442886 -1.7506738974450796e-05 4.9901803607214426 --0.0 5.0 +0.121425319023123 0.1 +0.12140838835621631 0.15991983967935872 +0.12139071449774234 0.21983967935871745 +0.1213717842816119 0.27975951903807617 +0.12135148588814255 0.3396793587174349 +0.12132979487816627 0.3995991983967936 +0.12130670746644738 0.45951903807615235 +0.12128222672399011 0.519438877755511 +0.12125635978596774 0.5793587174348698 +0.12122911693316699 0.6392785571142284 +0.12120051083439257 0.6991983967935872 +0.12117055578550437 0.7591182364729459 +0.12113926701679116 0.8190380761523046 +0.1211066601233711 0.8789579158316633 +0.12107275063288028 0.938877755511022 +0.12103755369959036 0.9987975951903807 +0.12100108390352156 1.0587174348697395 +0.12096335513116083 1.1186372745490982 +0.12092438051655453 1.178557114228457 +0.12088417242519985 1.2384769539078158 +0.12084274246698057 1.2983967935871745 +0.12080010152779963 1.358316633266533 +0.12075625981236233 1.4182364729458918 +0.12071122689275884 1.4781563126252506 +0.12066501175915696 1.5380761523046094 +0.12061762287014437 1.5979959919839681 +0.1205690682011479 1.6579158316633267 +0.12051935528998817 1.7178356713426854 +0.1204684912790665 1.7777555110220442 +0.12041648295398025 1.837675350701403 +0.12036333677855998 1.8975951903807615 +0.12030905892644882 1.9575150300601203 +0.12025365530941955 2.017434869739479 +0.12019713160266698 2.0773547094188376 +0.1201394932673306 2.1372745490981964 +0.12008074557050495 2.197194388777555 +0.12002089360298798 2.257114228456914 +0.11995994229500362 2.3170340681362727 +0.11989789643011844 2.3769539078156314 +0.11983476065755397 2.43687374749499 +0.11977053950307724 2.496793587174349 +0.11970523737863466 2.5567134268537077 +0.11963885859087643 2.616633266533066 +0.11957140734870349 2.676553106212425 +0.11950288776995349 2.7364729458917836 +0.11943330388732974 2.7963927855711423 +0.11936265965366437 2.856312625250501 +0.11929095894659672 2.91623246492986 +0.11921820557273803 2.9761523046092186 +0.11914440327138515 3.0360721442885774 +0.11906955571783823 3.095991983967936 +0.11899366652637096 3.1559118236472945 +0.1189167392528957 3.2158316633266533 +0.11883877739736098 3.275751503006012 +0.11875978440591393 3.335671342685371 +0.11867976367285639 3.3955911823647296 +0.11859871854242 3.4555110220440883 +0.11851665231038216 3.515430861723447 +0.11843356822554228 3.575350701402806 +0.11834946949107525 3.6352705410821646 +0.11826435926577697 3.695190380761523 +0.11817824066521501 3.7551102204408817 +0.11809111676279559 3.8150300601202405 +0.11800299059075708 3.8749498997995993 +0.11791386514109863 3.934869739478958 +0.11782374336645146 3.994789579158317 +0.11773262818089976 4.0547094188376755 +0.11764052246075672 4.114629258517033 +0.11754742904530106 4.174549098196392 +0.11745335073747833 4.234468937875751 +0.11735829030457096 4.29438877755511 +0.11726225047884048 4.3543086172344685 +0.11716523395814483 4.414228456913827 +0.11706724340653335 4.474148296593186 +0.11696828145482173 4.534068136272545 +0.11686835070114887 4.593987975951904 +0.1167674537115174 4.653907815631262 +0.11666559302031924 4.713827655310621 +0.11656277113084768 4.77374749498998 +0.11645899051579685 4.833667334669339 +0.11635425361774987 4.893587174348697 +0.11624856284965623 4.953507014028056 +0.11614192059529933 5.013426853707415 +0.11603432920975475 5.073346693386773 +0.1159257910198398 5.133266533066132 +0.11581630832455486 5.19318637274549 +0.1157058833955169 5.253106212424849 +0.11559451847738558 5.313026052104208 +0.11548221578828212 5.372945891783567 +0.1153689775202014 5.432865731462925 +0.11525480583941743 5.492785571142284 +0.11513970288688234 5.552705410821643 +0.11502367077861916 5.612625250501002 +0.1149067116061085 5.6725450901803605 +0.11478882743666935 5.732464929859719 +0.1146700203138339 5.792384769539078 +0.11455029225771687 5.852304609218437 +0.11442964526537903 5.9122244488977955 +0.11430808131118528 5.972144288577154 +0.11418560234715723 6.032064128256513 +0.1140622103033205 6.091983967935872 +0.11393790708804662 6.15190380761523 +0.11381269458838969 6.2118236472945885 +0.11368657467041794 6.271743486973947 +0.11355954917954006 6.331663326653306 +0.11343161994082651 6.391583166332665 +0.11330278875932585 6.4515030060120235 +0.113173057420376 6.511422845691382 +0.1130424276899107 6.571342685370741 +0.11291090131476103 6.6312625250501 +0.11277848002295217 6.691182364729459 +0.11264516552399538 6.751102204408817 +0.11251095950917525 6.811022044088176 +0.11237586365183233 6.870941883767535 +0.11223987960764115 6.930861723446894 +0.11210300901488365 6.990781563126252 +0.1119652534947182 7.050701402805611 +0.11182661465144401 7.11062124248497 +0.11168709407276137 7.170541082164329 +0.1115466933300273 7.230460921843687 +0.11140541397850715 7.290380761523045 +0.11126325755762179 7.350300601202404 +0.11112022559119074 7.410220440881763 +0.11097631958767112 7.470140280561122 +0.11083154104039256 7.53006012024048 +0.11068589142778804 7.589979959919839 +0.11053937221362092 7.649899799599198 +0.11039198484720793 7.709819639278557 +0.11024373076363835 7.7697394789579155 +0.11009461138398949 7.829659318637274 +0.10994462811553835 7.889579158316633 +0.10979378235196964 7.949498997995992 +0.10964207547358021 8.009418837675351 +0.10948950884747988 8.06933867735471 +0.10933608382778878 8.129258517034067 +0.10918180175583128 8.189178356713427 +0.10902666396032648 8.249098196392785 +0.10887067175757538 8.309018036072144 +0.10871382645164479 8.368937875751502 +0.10855612933454799 8.428857715430862 +0.10839758168642219 8.48877755511022 +0.10823818477570293 8.54869739478958 +0.10807793985929544 8.608617234468937 +0.1079168481827428 8.668537074148297 +0.1077549109803914 8.728456913827655 +0.1075921294755533 8.788376753507015 +0.10742850488066578 8.848296593186372 +0.10726403839744816 8.90821643286573 +0.10709873121705572 8.96813627254509 +0.10693258452023102 9.028056112224448 +0.10676559947745254 9.087975951903807 +0.10659777724908065 9.147895791583165 +0.1064291189855011 9.207815631262525 +0.10625962582726592 9.267735470941883 +0.10608929890523189 9.327655310621243 +0.10591813934069656 9.3875751503006 +0.1057461482455319 9.44749498997996 +0.1055733267223156 9.507414829659318 +0.1053996758644601 9.567334669338678 +0.10522519675633932 9.627254509018035 +0.10504989047341323 9.687174348697395 +0.10487375808235025 9.747094188376753 +0.10469680064114745 9.807014028056113 +0.10451901919924876 9.86693386773547 +0.10434041479766107 9.92685370741483 +0.10416098846906834 9.986773547094188 +0.10398073407630146 10.046693386773546 +0.10379964334249057 10.106613226452906 +0.10361771502902013 10.166533066132263 +0.10343494990596491 10.226452905811623 +0.1032513487363444 10.286372745490981 +0.10306691227619157 10.34629258517034 +0.10288164127462202 10.406212424849699 +0.10269553647390306 10.466132264529058 +0.10250859860488983 10.526052104208416 +0.10232082838988876 10.585971943887776 +0.10213222654794062 10.645891783567134 +0.10194279379208342 10.705811623246493 +0.10175253082882922 10.765731462925851 +0.10156143835823289 10.82565130260521 +0.1013695170739608 10.885571142284569 +0.10117676766335908 10.945490981963928 +0.10098319080752172 11.005410821643286 +0.10078878718135827 11.065330661322644 +0.10059355745366114 11.125250501002004 +0.1003975022871726 11.185170340681362 +0.1002006223386513 11.245090180360721 +0.10000291825893835 11.30501002004008 +0.0998043906914611 11.364929859719439 +0.09960504026244762 11.424849699398797 +0.09940486759279751 11.484769539078156 +0.09920387330798681 11.544689378757514 +0.09900205802787754 11.604609218436874 +0.09879942236678083 11.664529058116232 +0.0985959669335195 11.724448897795591 +0.0983916923314902 11.78436873747495 +0.09818659915872471 11.844288577154309 +0.09798068800795103 11.904208416833667 +0.09777395946665357 11.964128256513026 +0.097566414117133 12.024048096192384 +0.09735805253656535 12.083967935871744 +0.09714887529706062 12.143887775551102 +0.09693888296572072 12.20380761523046 +0.09672807610469686 12.26372745490982 +0.09651645526868476 12.323647294589177 +0.09630402099063423 12.383567134268537 +0.09609077380018405 12.443486973947895 +0.09587671423805495 12.503406813627254 +0.09566184284027839 12.563326653306612 +0.09544616013825023 12.623246492985972 +0.0952296666587841 12.68316633266533 +0.09501236292416393 12.74308617234469 +0.09479424945219606 12.803006012024047 +0.09457532675626065 12.862925851703407 +0.09435559534536264 12.922845691382765 +0.09413505572418195 12.982765531062125 +0.09391370839312323 13.042685370741482 +0.09369155384836503 13.102605210420842 +0.09346859258190836 13.1625250501002 +0.09324482508162465 13.22244488977956 +0.09302025183130332 13.282364729458918 +0.09279487331069851 13.342284569138275 +0.09256868997577031 13.402204408817635 +0.09234170227254526 13.462124248496993 +0.09211391066193633 13.522044088176353 +0.09188531560596591 13.58196392785571 +0.09165591756283344 13.64188376753507 +0.09142571698695914 13.701803607214428 +0.09119471432902715 13.761723446893788 +0.09096291003602812 13.821643286573146 +0.09073030455130138 13.881563126252505 +0.09049689831457657 13.941482965931863 +0.09026269176201467 14.001402805611223 +0.09002768532624876 14.06132264529058 +0.08979187943642404 14.12124248496994 +0.08955527451823757 14.181162324649298 +0.08931787099397738 14.241082164328658 +0.08907966928256124 14.301002004008016 +0.08884066979957483 14.360921843687374 +0.08860087295730958 14.420841683366733 +0.08836027916479998 14.480761523046091 +0.08811888879811472 14.54068136272545 +0.08787670222898591 14.600601202404809 +0.08763371985479183 14.660521042084168 +0.08738994206999388 14.720440881763526 +0.08714536926596465 14.780360721442886 +0.08690000183102266 14.840280561122244 +0.08665384015046662 14.900200400801603 +0.08640688460660943 14.960120240480961 +0.08615913557881155 15.02004008016032 +0.08591059344351418 15.079959919839679 +0.08566125857427187 15.139879759519038 +0.08541113134178492 15.199799599198396 +0.08516021211393122 15.259719438877756 +0.08490850125579784 15.319639278557114 +0.08465599912971214 15.379559118236473 +0.08440270609527264 15.439478957915831 +0.08414862250937939 15.49939879759519 +0.08389374872626403 15.559318637274549 +0.08363808509751958 15.619238476953907 +0.08338163197212971 15.679158316633266 +0.08312438967587939 15.739078156312624 +0.08286635851776476 15.798997995991984 +0.08260753882399341 15.858917835671342 +0.08234793093162586 15.918837675350701 +0.08208753517524503 15.97875751503006 +0.08182635188698356 16.03867735470942 +0.0815643813965509 16.098597194388777 +0.08130162403125991 16.158517034068137 +0.08103808011605351 16.218436873747496 +0.0807737499735306 16.278356713426856 +0.08050863392397196 16.338276553106216 +0.08024273228536584 16.39819639278557 +0.079976045373433 16.45811623246493 +0.07970857350165188 16.51803607214429 +0.07944031698128311 16.577955911823647 +0.0791712761213939 16.637875751503007 +0.07890145122888219 16.697795591182366 +0.07863084260850044 16.757715430861726 +0.07835945056287921 16.817635270541082 +0.0780872753925504 16.87755511022044 +0.07781431739597036 16.9374749498998 +0.07754057686954256 16.99739478957916 +0.07726605408886074 17.057314629258517 +0.07699074930769184 17.117234468937877 +0.07671466279577374 17.177154308617236 +0.0764377948398719 17.237074148296596 +0.07616014572480044 17.296993987975952 +0.07588171573344343 17.356913827655312 +0.07560250514677602 17.41683366733467 +0.0753225142438852 17.47675350701403 +0.07504174330199044 17.536673346693387 +0.07476019259646402 17.596593186372747 +0.07447786240085125 17.656513026052107 +0.07419475298689038 17.716432865731463 +0.07391086462453228 17.776352705410822 +0.07362619758196003 17.836272545090182 +0.07334075212560814 17.89619238476954 +0.07305452852018172 17.956112224448898 +0.07276752702867524 18.016032064128257 +0.07247974791239135 18.075951903807617 +0.07219119143095933 18.135871743486977 +0.07190185784235331 18.195791583166333 +0.07161174740291044 18.255711422845692 +0.07132086036734879 18.315631262525052 +0.07102919698878503 18.375551102204412 +0.070736757518752 18.435470941883768 +0.07044354218567196 18.495390781563128 +0.07014955119592854 18.555310621242487 +0.06985478477515074 18.615230460921847 +0.06955924316717133 18.675150300601203 +0.0692629266143168 18.735070140280563 +0.06896583535742394 18.794989979959922 +0.06866796963585607 18.85490981963928 +0.0683693296875191 18.914829659318638 +0.06806991574887766 18.974749498997998 +0.0677697280549708 19.034669338677357 +0.06746876683942765 19.094589178356713 +0.06716703233448293 19.154509018036073 +0.06686452477099228 19.214428857715433 +0.06656124437844745 19.274348697394792 +0.06625719138499132 19.33426853707415 +0.06595236601743273 19.394188376753508 +0.06564676850126132 19.454108216432868 +0.065340399060662 19.514028056112227 +0.06503325791852947 19.573947895791584 +0.06472534529648245 19.633867735470943 +0.06441666141487792 19.693787575150303 +0.06410720649282507 19.753707414829663 +0.06379698074819923 19.81362725450902 +0.06348598439765553 19.87354709418838 +0.06317421765664266 19.933466933867738 +0.06286168073941624 19.993386773547094 +0.0625483738357693 20.053306613226454 +0.06223429711250153 20.113226452905813 +0.06191945075782758 20.173146292585173 +0.061603834979931035 20.23306613226453 +0.061287449985861574 20.29298597194389 +0.0609702959815478 20.35290581162325 +0.0606523731718098 20.412825651302608 +0.06033368176037164 20.472745490981964 +0.0600142219498737 20.532665330661324 +0.059693993941885015 20.592585170340683 +0.059372997936915355 20.652505010020043 +0.05905123413442728 20.7124248496994 +0.05872870273284801 20.77234468937876 +0.05840540392958132 20.83226452905812 +0.05808133792101918 20.892184368737478 +0.057756504902553366 20.952104208416834 +0.05743090506858689 21.012024048096194 +0.05710453861254549 21.071943887775554 +0.05677740572688885 21.13186372745491 +0.05644950660312172 21.19178356713427 +0.05612084143180511 21.25170340681363 +0.05579141040256717 21.31162324649299 +0.055461213704114116 21.371543086172345 +0.055130251524240954 21.431462925851704 +0.05479852404984226 21.491382765531064 +0.05446603146692267 21.551302605210424 +0.054132773960607464 21.61122244488978 +0.053798751715152845 21.67114228456914 +0.05346396489824194 21.7310621242485 +0.05312841364462317 21.79098196392786 +0.05279209810325449 21.850901803607215 +0.05245501845368246 21.910821643286575 +0.052117174874629926 21.970741482965934 +0.05177856754400584 22.03066132264529 +0.05143919663891498 22.09058116232465 +0.0510990623356678 22.15050100200401 +0.05075816480978991 22.21042084168337 +0.0504165042360317 22.270340681362725 +0.05007408078837771 22.330260521042085 +0.0497308946400561 22.390180360721445 +0.049386945963547896 22.450100200400804 +0.04904223493059621 22.51002004008016 +0.04869676171221532 22.56993987975952 +0.04835052647869987 22.62985971943888 +0.048003529399633746 22.68977955911824 +0.04765577064389905 22.749699398797596 +0.047307250379684834 22.809619238476955 +0.04695796877449601 22.869539078156315 +0.046607925995161954 22.929458917835674 +0.046257122207845155 22.98937875751503 +0.045905557578049705 23.04929859719439 +0.045553232270629886 23.10921843687375 +0.045200146449798535 23.169138276553106 +0.04484630027913531 23.229058116232466 +0.0444916939215951 23.288977955911825 +0.04413632753951614 23.348897795591185 +0.04378020129462823 23.40881763527054 +0.043423315348060675 23.4687374749499 +0.043065669860350465 23.52865731462926 +0.04270726495320721 23.58857715430862 +0.04234810073533053 23.648496993987976 +0.04198817735247012 23.708416833667336 +0.04162749496162177 23.768336673346695 +0.04126605371922335 23.828256513026055 +0.04090385378116243 23.88817635270541 +0.040540895302783805 23.94809619238477 +0.04017717843889715 24.00801603206413 +0.039812703343784374 24.06793587174349 +0.039447470171207095 24.127855711422846 +0.039081479074413894 24.187775551102206 +0.03871473020614774 24.247695390781566 +0.03834722371865316 24.30761523046092 +0.037978959763683345 24.36753507014028 +0.03760993849250744 24.42745490981964 +0.037240160055917494 24.487374749499 +0.03686962460423554 24.547294589178357 +0.036498332287320474 24.607214428857716 +0.03612628325457509 24.667134268537076 +0.03575347765495288 24.727054108216436 +0.03537991563696487 24.786973947895792 +0.035005597348686274 24.84689378757515 +0.03463052293776338 24.90681362725451 +0.03425469255142008 24.96673346693387 +0.033878106336464556 25.026653306613227 +0.03350076443929574 25.086573146292587 +0.033122667005909955 25.146492985971946 +0.032743814181907305 25.206412825651306 +0.03236420611249814 25.266332665330662 +0.031983842942509326 25.32625250501002 +0.03160272481639071 25.38617234468938 +0.031220851878221344 25.446092184368737 +0.030838224271715634 25.506012024048097 +0.03045484210790058 25.565931863727457 +0.03007070547674296 25.625851703406816 +0.02968581449960863 25.685771543086172 +0.029300169317645328 25.745691382765532 +0.028913770071662775 25.80561122244489 +0.02852661690213856 25.86553106212425 +0.028138709949224107 25.925450901803607 +0.02775004935275048 25.985370741482967 +0.02736063525223437 26.045290581162327 +0.02697046778688381 26.105210420841686 +0.02657954709560398 26.165130260521043 +0.02618787331700286 26.225050100200402 +0.025795446589397024 26.284969939879762 +0.025402267050817235 26.34488977955912 +0.02500833483901407 26.404809619238478 +0.024613650091463407 26.464729458917837 +0.0242182129453721 26.524649298597197 +0.023822023537683396 26.584569138276553 +0.023425082005082334 26.644488977955913 +0.02302738848400129 26.704408817635272 +0.02262894311062527 26.764328657314632 +0.02222974602089732 26.824248496993988 +0.021829797350523712 26.884168336673348 +0.02142909723497939 26.944088176352707 +0.0210276458095131 27.004008016032067 +0.020625443209152636 27.063927855711423 +0.020222489568709937 27.123847695390783 +0.019818785022786337 27.183767535070142 +0.019414329705777594 27.243687374749502 +0.01900912375187899 27.303607214428858 +0.018603167295090282 27.363527054108218 +0.01819646046922084 27.423446893787577 +0.01778900340789452 27.483366733466937 +0.017380796244554648 27.543286573146293 +0.016971839112468825 27.603206412825653 +0.01656213214473395 27.663126252505013 +0.01615167543741968 27.72304609218437 +0.0157404690678686 27.78296593186373 +0.015328513149580648 27.842885771543088 +0.014915807813920604 27.902805611222448 +0.0145023531921029 27.962725450901804 +0.014088149415196219 28.022645290581163 +0.013673196614128294 28.082565130260523 +0.01325749491969044 28.142484969939883 +0.012841044462542207 28.20240480961924 +0.012423845373215843 28.2623246492986 +0.012005897782120984 28.322244488977958 +0.01158720181954907 28.382164328657318 +0.011167757615677875 28.442084168336674 +0.010747565300575874 28.502004008016034 +0.010326625004206802 28.561923847695393 +0.009904936856433995 28.62184368737475 +0.009482500987024679 28.68176352705411 +0.009059317525654472 28.74168336673347 +0.0086353866019116 28.80160320641283 +0.00821070834530124 28.861523046092184 +0.00778528288524968 28.921442885771544 +0.007359110351108725 28.981362725450904 +0.006932190872159793 29.041282565130263 +0.006504524577618163 29.10120240480962 +0.0060761115966370335 29.16112224448898 +0.005646952058311815 29.22104208416834 +0.005217046091684137 29.2809619238477 +0.004786393825745993 29.340881763527054 +0.004354995389443691 29.400801603206414 +0.003922850911682054 29.460721442885774 +0.00348996052132833 29.520641282565133 +0.003056324347216233 29.58056112224449 +0.0026219425181498047 29.64048096192385 +0.002186815162907511 29.70040080160321 +0.0017509424102460907 29.760320641282565 +0.0013143243889043696 29.820240480961925 +0.000876961227607289 29.880160320641284 +0.0004388530550696508 29.940080160320644 +-0.0 30.0 diff --git a/ELoss/__pycache__/PCEnergyAnalysis.cpython-310.pyc b/ELoss/__pycache__/PCEnergyAnalysis.cpython-310.pyc index e1ed43d..baa7b6d 100644 Binary files a/ELoss/__pycache__/PCEnergyAnalysis.cpython-310.pyc and b/ELoss/__pycache__/PCEnergyAnalysis.cpython-310.pyc differ