Leginon

1. In pyscope edited gatan.py
   copied Gatan class to new GatanGIF class
   changed the value for the "name" variable from Gatan to GatanGIF
2. In pyscope edit tecnai.py
   copied Tecnai class to new TecnaiEFTEM class
   changed the value for the "name" variable from Tecnai to TecnaiEFTEM
3. added GatanGIF and TecnaiEFTEM to instrument.cfg
4. added GatanGIF and TecnaiEFTEM to database
5. because TecnaiEFTEM has completely different mags, it must be completely calibrated
6. in order for it to work, the GIF has to be selected in the Tecnai interface, and EFTEM mode must be activated. Then the instrument and camera have to be properly set in the presets.

OK. More information on this. On the microscope computer, I tried:
from pyScope import gatan
myccd = gatan.Gatan()
and it yielded the following exception:

Traceback (most recent call last):
  File "<pyshell#1>", line 1, in <module>
    ccd=gatan.Gatan()
  File "c:\python25\Lib\site-packages\pyscope\loggedmethods.py", line 24, in new_f
    if mylock._RLock__count == 1 and args[0].logged_methods_on:
  File "c:\python25\Lib\site-packages\pyscope\loggedmethods.py", line 27, in new_f
    result = f(*args, **kwargs)
  File "c:\python25\lib\site-packages\pyscope\gatan.py", line 69, in __getattribute__
    if attr_name in object.__getattribute__(self, 'unsupported'):
AttributeError: 'Gatan' object has no attribute 'unsupported'

Jim is on the road.

See if the test used in #1469 will help you finding out what is actually registered and what is called.

Creating instance with ccd = gatan.Gatan() does not work any more. Need

from pyscope import registry
ccd = registry.getClass('Gatan')

OK, I'm not exactly sure what to look for. I tried the following, and I don't know what to make of it:

>>> ccd=registry.getClass('Gatan')
>>> ccd.getBinning()

Traceback (most recent call last):
  File "<pyshell#4>", line 1, in <module>
    ccd.getBinning()
TypeError: unbound method new_f() must be called with Gatan instance as first argument (got nothing instead)
>>> dir(registry)
['__builtins__', '__doc__', '__file__', '__name__', 'c', 'ccdcameraorder', 'ccdcameras', 'config', 'getClass', 'getClasses', 'temorder', 'tems']
>>> registry.ccdcameras
{'Gatan': <class 'pyscope.gatan.Gatan'>, 'GatanGIF': <class 'pyscope.gatan.GatanGIF'>}
>>> registry.tems
{'Tecnai': <class 'pyscope.tecnai.Tecnai'>, 'TecnaiEFTEM': <class 'pyscope.tecnai.TecnaiEFTEM'>}

Sorry, my bad,

you need to use

ccd = registry.getClass('Gatan')()

OK, I did ccd = registry.getClass('Gatan')(), and it gave the original exception:

Traceback (most recent call last):
  File "<pyshell#1>", line 1, in <module>
    ccd=registry.getClass('Gatan')()
  File "c:\python25\Lib\site-packages\pyscope\loggedmethods.py", line 24, in new_f
    if mylock._RLock__count == 1 and args[0].logged_methods_on:
  File "c:\python25\Lib\site-packages\pyscope\loggedmethods.py", line 27, in new_f
    result = f(*args, **kwargs)
  File "c:\python25\lib\site-packages\pyscope\gatan.py", line 69, in __getattribute__
    if attr_name in object.__getattribute__(self, 'unsupported'):
AttributeError: 'Gatan' object has no attribute 'unsupported'

Almost out of idea. You don't have two separate computer, one for TEM and one for camera, do you? and DM is on? And if you only have one of the two camera registered, it still works?

Found it. See #1886.

I've updated branch 2.2 with that and another change which I think might help you that didn't make it into the branch in pyscope.

That did it. Thanks!!!!