Version bump, prep for release 0.4.0

ChristopherMayes · Apr 22, 2020 · 0fb43c9 · 0fb43c9
1 parent f36e274
commit 0fb43c9
Show file tree

Hide file tree

Showing 9 changed files with 671 additions and 148 deletions.
diff --git a/astra/_version.py b/astra/_version.py
@@ -1,3 +1,3 @@
 
 
-__version__ = '0.1.2'
+__version__ = '0.4.0'
diff --git a/astra/astra.py b/astra/astra.py
@@ -341,6 +341,7 @@ def load_archive(self, h5=None):
         See: Astra.archive
         """
         if isinstance(h5, str):
+            h5 = os.path.expandvars(h5)
             g = h5py.File(h5, 'r')
 
             glist = archive.find_astra_archives(g)
@@ -378,6 +379,7 @@ def archive(self, h5=None):
             h5 = 'astra_'+self.fingerprint()+'.h5'
 
         if isinstance(h5, str):
+            h5 = os.path.expandvars(h5)
             g = h5py.File(h5, 'w')
             self.vprint(f'Archiving to file {h5}')
         else:

diff --git a/examples/elements/apex_gun.ipynb b/examples/elements/apex_gun.ipynb
diff --git a/examples/elements/drift.ipynb b/examples/elements/drift.ipynb
diff --git a/examples/functional_astra_run.ipynb b/examples/functional_astra_run.ipynb
@@ -60,7 +60,7 @@
       "phases is in astra newrun\n",
       "loading 1 particle files\n",
       "[100.0]\n",
-      "{'start_time': 1587331294.928564, 'run_script': '/Users/chrisonian/Code/astra/bin/Astra /var/folders/wj/lfgr01993dx79p9cm_skykbw0000gn/T/tmp1r1og4sl/astra.in', 'why_error': '', 'run_time': 2.0185678005218506, 'run_error': False}\n"
+      "{'start_time': 1587527018.701377, 'run_script': '/Users/chrisonian/Code/astra/bin/Astra /var/folders/wj/lfgr01993dx79p9cm_skykbw0000gn/T/tmpirf4nik4/astra.in', 'why_error': '', 'run_time': 1.5767550468444824, 'run_error': False}\n"
      ]
     }
    ],
@@ -92,7 +92,7 @@
       "                              generator              \n",
       "                             Version 1.0             \n",
       "                        DESY,  Hamburg 2002          \n",
-      "                        Sun Apr 19 14:21:37 \n",
+      "                        Tue Apr 21 20:43:40 \n",
       "\n",
       "     Working File is:    /var/folders/wj/lfgr01993dx79p9cm_skykbw0000gn/T/t\n",
       "     Initializing       2000      electrons\n",
@@ -134,10 +134,10 @@
       "     Generator ended with     1 warning(s)\n",
       "\n",
       "\n",
-      "Initial particles written to /var/folders/wj/lfgr01993dx79p9cm_skykbw0000gn/T/tmpmyj_rjga/astra.particles\n",
+      "Initial particles written to /var/folders/wj/lfgr01993dx79p9cm_skykbw0000gn/T/tmpkzoj4a33/astra.particles\n",
       "loading 1 particle files\n",
       "[100.0]\n",
-      "{'start_time': 1587331297.176398, 'run_script': '/Users/chrisonian/Code/astra/bin/Astra /var/folders/wj/lfgr01993dx79p9cm_skykbw0000gn/T/tmpmyj_rjga/astra.in', 'why_error': '', 'run_time': 1.9765520095825195, 'run_error': False}\n",
+      "{'start_time': 1587527020.373141, 'run_script': '/Users/chrisonian/Code/astra/bin/Astra /var/folders/wj/lfgr01993dx79p9cm_skykbw0000gn/T/tmpkzoj4a33/astra.in', 'why_error': '', 'run_time': 1.5807349681854248, 'run_error': False}\n",
       "run_astra_with_generator finished\n"
      ]
     }
@@ -202,13 +202,13 @@
       "   Scaling sigma_t = 8.36979 ps -> 8.5 ps\n",
       "   Cathode start: fixing pz momenta to forward hemisphere\n",
       "      avg_pz -> 285.455 eV/c, sigma_pz -> 215.094 eV/c\n",
-      "...done. Time Ellapsed: 53.8549 ms.\n",
+      "...done. Time Ellapsed: 47.4193 ms.\n",
       "\n",
       "   Created particles in .particles: ParticleGroup with 2000 particles with total charge 9.999999999999999e-11 Cset spacecharge mesh for n_particles: 2000 to {'nrad': 10, 'nlong_in': 20}\n",
-      "Initial particles written to /var/folders/wj/lfgr01993dx79p9cm_skykbw0000gn/T/tmp9u_ct5z7/astra.particles\n",
+      "Initial particles written to /var/folders/wj/lfgr01993dx79p9cm_skykbw0000gn/T/tmplv9ji4uc/astra.particles\n",
       "loading 1 particle files\n",
       "[100.0]\n",
-      "{'start_time': 1587331299.2653198, 'run_script': '/Users/chrisonian/Code/astra/bin/Astra /var/folders/wj/lfgr01993dx79p9cm_skykbw0000gn/T/tmp9u_ct5z7/astra.in', 'why_error': '', 'run_time': 1.6009023189544678, 'run_error': False}\n"
+      "{'start_time': 1587527022.0613399, 'run_script': '/Users/chrisonian/Code/astra/bin/Astra /var/folders/wj/lfgr01993dx79p9cm_skykbw0000gn/T/tmplv9ji4uc/astra.in', 'why_error': '', 'run_time': 1.5611350536346436, 'run_error': False}\n"
      ]
     }
    ],
@@ -232,7 +232,7 @@
     {
      "data": {
       "text/plain": [
-       "[<matplotlib.lines.Line2D at 0x11b0ef4d0>]"
+       "[<matplotlib.lines.Line2D at 0x11e9fd890>]"
       ]
      },
      "execution_count": 7,
@@ -348,8 +348,8 @@
        " 'end_n_particle_loss': 0,\n",
        " 'end_total_charge': 9.995e-11,\n",
        " 'end_higher_order_energy_spread': 1.5767317174233662,\n",
-       " 'fingerprint': '26180cd9282fcd02088ba09f0b47d053',\n",
-       " 'archive': '/Users/chrisonian/Code/GitHub/lume-astra/examples/26180cd9282fcd02088ba09f0b47d053.h5'}"
+       " 'fingerprint': '597c38ee049292f47b1038f1de2041c8',\n",
+       " 'archive': '/Users/chrisonian/Code/GitHub/lume-astra/examples/597c38ee049292f47b1038f1de2041c8.h5'}"
       ]
      },
      "execution_count": 9,
@@ -509,8 +509,8 @@
        " 'end_n_particle_loss': 0,\n",
        " 'end_total_charge': 9.999999999999999e-11,\n",
        " 'end_higher_order_energy_spread': 1.5259614824335763,\n",
-       " 'fingerprint': '690985a8c4404ba6fd55ba634469cbb6',\n",
-       " 'archive': '/Users/chrisonian/Code/GitHub/lume-astra/examples/690985a8c4404ba6fd55ba634469cbb6.h5'}"
+       " 'fingerprint': '73da23e4974938d55b17c346a0e35ab7',\n",
+       " 'archive': '/Users/chrisonian/Code/GitHub/lume-astra/examples/73da23e4974938d55b17c346a0e35ab7.h5'}"
       ]
      },
      "execution_count": 13,
@@ -700,8 +700,8 @@
       "end_n_particle_loss 0 0\n",
       "end_total_charge 9.995e-11 9.999999999999999e-11\n",
       "end_higher_order_energy_spread 1.5767317174233662 1.5259614824335763\n",
-      "fingerprint 26180cd9282fcd02088ba09f0b47d053 690985a8c4404ba6fd55ba634469cbb6\n",
-      "archive /Users/chrisonian/Code/GitHub/lume-astra/examples/26180cd9282fcd02088ba09f0b47d053.h5 /Users/chrisonian/Code/GitHub/lume-astra/examples/690985a8c4404ba6fd55ba634469cbb6.h5\n"
+      "fingerprint 597c38ee049292f47b1038f1de2041c8 73da23e4974938d55b17c346a0e35ab7\n",
+      "archive /Users/chrisonian/Code/GitHub/lume-astra/examples/597c38ee049292f47b1038f1de2041c8.h5 /Users/chrisonian/Code/GitHub/lume-astra/examples/73da23e4974938d55b17c346a0e35ab7.h5\n"
      ]
     }
    ],