639d638
<         void setNoCyCallbackParameters(unsigned short)
645d643
<         void setPyCyHandlerHandle(void *)
686,687c684,685
<         void setPyHandlerGet(void *)
<         void setPyHandlerPut(void *)
---
>         void setPyHandlerGet()
>         void setPyHandlerPut()
956,1041d953
< cdef extern from "zbsDataHolders.h":
< 
<     cdef cppclass BSChannel:
<         BSChannel(string) except +
<         void   setType()
<         void   setOffset()
<         void   setModulo()
<         void   setBSEnabled()
<         string getName()
<         string getType()
<         int    getModulo()
<         int    getOffset()
<         unsigned int getNelem()
<         bint   isBSEnabled()
< 
<     cdef cppclass BSDataHolder:
<         BSDataHolder() except +
<         BSDataHolder(vector[string]) except +
<         void init(vector[string])
<         BSChannel getBSChannel(unsigned int)
<         int getIdxFromName(string)
<         etsNorm getGlobal_timestamp()
<         unsigned long long getPulse_id()
<         vector[unsigned int] getHandles()
<         vector[string] getPV()
<         vector[PVDataHolder] getPVDataV()
<         vector[string] getAsStringV()
<         vector[double] getAsDoubleV()
<         vector[float]  getAsFloatV()
<         vector[int]    getAsIntV()
<         int reconnect()
<         void closeBS()
<         int resetBS()
<         int setBS(bint)
<         int setCA(bint)
<         void setTimeout(int)
<         void setHWM(int)
<         bint getIsBS()
<         void setBSModulo(string, int)
<         void setBSOffset(string, int)
<         void setBSModuloOffset(string, int, int)
<         void printHeader()
<         unsigned int getNPV()
<         unsigned int getHWM()
<         int getTimeout()
<         unsigned int getNChannels()
<         unsigned int getNNullData()
<         float getPGoodData()
<         void zero()
<         int getStatus()
< 
<     cdef cppclass DBPMData:
<         double getValue()
<         epicsTimeStamp getEpicsTimeStamp()
<         int getStatus()
< 
<     cdef cppclass DBPMKeeper:
<         DBPMKeeper() except +
<         # DBPMKeeper(vector[string], vector[unsigned int], multimap[float, string])
<         DBPMKeeper(vector[string], vector[unsigned int], vector[string], vector[float]) except +
<         vector[unsigned int] getHandle()
<         vector[string]  getPV()
<         vector[string]  getDevice()
< 
<         vector[double]   getS()
<         vector[DBPMData] getX()
<         vector[DBPMData] getY()
<         vector[DBPMData] getQ()
<         vector[DBPMData] getEnergy()
< 
<         vector[double] getOffsetX()
<         vector[double] getOffsetY()
< 
<         bint getIsAllXOK()
<         bint getIsAllYOK()
<         bint getIsAllQOK()
<         bint getIsAllEnergyOK()
<         bint getIsAllOK()
<         bint setBS(bint)
<         bint resetBS()
<         void closeBS()
<         int  getStatus()
<         PVDataHolder * pvd
<         int  getNPV()
< 
< 
1432,1433c1344,1345
<         int readDBPMOffsets(DBPMKeeper &)
<         int getDBPM(DBPMKeeper &) nogil
---
>         #int readDBPMOffsets(DBPMKeeper &)
>         #int getDBPM(DBPMKeeper &) nogil
1435c1347
<         int prepareDBPM(vector[string] & , vector[unsigned int] & ,  vector[string] & , vector[float] & ) nogil
---
>         #int prepareDBPM(vector[string] & , vector[unsigned int] & ,  vector[string] & , vector[float] & ) nogil
1445,1449c1357,1361
<         int initBSwithCA(BSDataHolder &) nogil
<         int setBS(BSDataHolder &) nogil
<         int setBS2CAGroup(BSDataHolder &) nogil
<         int getBS(BSDataHolder &) nogil
<         int closeBS(BSDataHolder &) nogil
---
>         #int initBSwithCA(BSDataHolder &) nogil
>         #int setBS(BSDataHolder &) nogil
>         #int setBS2CAGroup(BSDataHolder &) nogil
>         #int getBS(BSDataHolder &) nogil
>         #int closeBS(BSDataHolder &) nogil