note tested, but runs the core init traj get

Author: dwhswenson

paths_cli/parameters.py

@@ -64,8 +64,11 @@ def get(self, storage, name):
         result = None
         # if the we can get by name/number, do it
         if name is not None:
-            # note: new storage may do a try/except here
-            result = store[name]
+            try:
+                result = store[name]
+            except:
+                # on any error, we try everything else
+                pass
 
             if result is None:
                 try:
@@ -98,6 +101,9 @@ def get(self, storage, name):
 
 def init_traj_fallback(parameter, storage, name):
     result = None
+    if isinstance(name, int):
+        return storage.trajectories[name]
+
     if name and os.path.isfile(name):
         # TODO: read from file
         pass
@@ -130,7 +136,7 @@ def init_traj_fallback(parameter, storage, name):
     param=Option('-t', '--init-traj',
                  help="identifier for initial trajectory"),
     store='tags',
-    num_store='trajectories',
+    num_store='samplesets',
     fallback=init_traj_fallback
 )
 

paths_cli/tests/test_parameters.py

@@ -187,6 +187,20 @@ def create_file(self, getter):
     ])
     def test_get(self, getter):
         filename = self.create_file(getter)
+        storage = paths.Storage(filename, mode='r')
+        get_type, getter_style = self._parse_getter(getter)
+        expected = {
+            'sset': self.sample_set,
+            'traj': self.traj
+        }[get_type]
+        get_arg = {
+            'name': 'traj',
+            'number': 0,
+            'tag-final': 'final_conditions',
+            'tag-initial': 'initial_conditions'
+        }[getter_style]
+        obj = self.PARAMETER.get(storage, get_arg)
+
         pytest.skip()
         pass