README.md

@@ -1,6 +1,30 @@
-# Lima-camera-meta
+[![License](https://img.shields.io/github/license/esrf-bliss/lima.svg?style=flat)](https://opensource.org/licenses/GPL-3.0)
+[![Gitter](https://img.shields.io/gitter/room/esrf-bliss/lima.svg?style=flat)](https://gitter.im/esrf-bliss/LImA)
+[![Conda](https://img.shields.io/conda/dn/esrf-bcu/lima-camera-meta.svg?style=flat)](https://anaconda.org/esrf-bcu)
+[![Version](https://img.shields.io/conda/vn/esrf-bcu/lima-camera-meta.svg?style=flat)](https://anaconda.org/esrf-bcu)
+[![Platform](https://img.shields.io/conda/pn/esrf-bcu/lima-camera-meta.svg?style=flat)](https://anaconda.org/esrf-bcu)
+
+# LImA Meta Camera Plugin
+
+Meta camera Hw interface for building mosaic of cameras
+
+## Install
+
+### Camera python
+
+conda install -c esrf-bcu lima-camera-meta
+
+# LImA
+
+Lima ( **L** ibrary for **Im** age **A** cquisition) is a project for the unified control of 2D detectors. The aim is to clearly separate hardware specific code from common software configuration and features, like setting standard acquisition parameters (exposure time, external trigger), file saving and image processing.
+
+Lima is a C++ library which can be used with many different cameras. The library also comes with a [Python](http://python.org) binding and provides a [PyTango](http://pytango.readthedocs.io/en/stable/) device server for remote control.
+
+## Documentation
+
+The documentation is available [here](https://lima1.readthedocs.io/)
+
 
-Meta camera Hw interface for mosaic of cameras
 
 ## An python code example: mosaic of 2 simulator cameras
 
@@ -10,7 +34,7 @@ from Lima import Core, Simulator, Meta
 cam1 = Simulator.Camera()
 cam2 = Simulator.Camera()
 hwint1 = Simulator.Interface(cam1)
-hwint1 = Simulator.Interface(cam2)
+hwint2 = Simulator.Interface(cam2)
 
 meta_config = '2x1'
 #meta_config = '1x2'

conda/camera/conda_build_config.yaml

@@ -7,6 +7,7 @@ cxx_compiler:
 python:
   - 2.7                        # [linux]
   - 3.6
+  - 3.7
 # This differs from target_platform in that it determines what subdir the compiler
 #    will target, not what subdir the compiler package will be itself.
 #    For example, we need a win-64 vs2008_win-32 package, so that we compile win-32

conda/tango/meta.yaml

@@ -1,7 +1,7 @@
 {% set version = GIT_DESCRIBE_TAG[1:] %}
 
 package:
-  name: lima-camera-simulator-tango
+  name: lima-camera-meta-tango
   version: {{ version }}
 
 source:

sip/MetaInterface.sip

@@ -22,5 +22,7 @@ namespace Meta
     virtual void 	getStatus(StatusType& status /Out/);
     virtual int 	getNbHwAcquiredFrames();
 
+  private:
+    Interface(const Meta::Interface&);
   };
 };

tango/MetaMaxipix5.py

@@ -137,7 +137,7 @@ def getTriggerLevel(self):
 
     @Core.DEB_MEMBER_FUNCT
     def setShutterLevel(self, level):
-	for p in range(5):
+        for p in range(5):
             self.priam[p].setShutterLevel(level)       
 
     @Core.DEB_MEMBER_FUNCT
@@ -149,8 +149,8 @@ def getShutterLevel(self):
 
     @Core.DEB_MEMBER_FUNCT
     def setEnergy(self, energy):
-	for m in range(5):
-	    self.mpx[m].setEnergy(energy)
+        for m in range(5):
+            self.mpx[m].setEnergy(energy)
 
     @Core.DEB_MEMBER_FUNCT
     def getEnergy(self):
@@ -472,10 +472,10 @@ def get_control(espia_dev_nb = [],
     if reconstruction_active.lower() == 'true': active = True
     else: active  = False
     if len(config_name) is not 5:
-	print config_name
-	raise Exception, "Invalid number of priam configuration, must be 5 !"
+        print (config_name)
+        raise Exception("Invalid number of priam configuration, must be 5 !")
     else:
-	for p in range(5):
+        for p in range(5):
             _MaxipixCamera.append(MaxipixModule.Camera(int(espia_dev_nb[p]), config_path, config_name[p], active))
 
             _MaxipixInterface.append(MaxipixModule[p].Interface(_MaxipixCamera[p]))
@@ -498,7 +498,7 @@ def get_control(espia_dev_nb = [],
             _MetaInterface.addInterface(0,3, _MaxipixInterface[3])
             _MetaInterface.addInterface(0,4, _MaxipixInterface[4])
         else:
-            raise Exception, "Invalid value for property meta_config: "+meta_config
+            raise Exception("Invalid value for property meta_config: "+meta_config)
 
 
     return Core.CtControl(_MetaInterface)