Commit d8c7d0da authored by Vincent Michel's avatar Vincent Michel
Browse files

Remove functions not included in the DLL

parent 504f334c
Pipeline #1253 failed with stages
in 2 minutes and 19 seconds
...@@ -11,42 +11,25 @@ typedef unsigned short parameter_t; ...@@ -11,42 +11,25 @@ typedef unsigned short parameter_t;
typedef unsigned short flag_t; typedef unsigned short flag_t;
int xiaInit(char *iniFile); int xiaInit(char *iniFile);
int xiaInitHandel(void); int xiaInitHandel(void);
int xiaNewDetector(char *alias);
int xiaAddDetectorItem(char *alias, char *name, void *value);
int xiaModifyDetectorItem(char *alias, char *name, void *value);
int xiaGetDetectorItem(char *alias, char *name, void *value); int xiaGetDetectorItem(char *alias, char *name, void *value);
int xiaGetNumDetectors(unsigned int *numDet); int xiaGetNumDetectors(unsigned int *numDet);
int xiaGetDetectors(char *detectors[]); int xiaGetDetectors(char *detectors[]);
int xiaGetDetectors_VB(unsigned int index, char *alias); int xiaGetDetectors_VB(unsigned int index, char *alias);
int xiaRemoveDetector(char *alias);
int xiaDetectorFromDetChan(int detChan, char *alias); int xiaDetectorFromDetChan(int detChan, char *alias);
int xiaNewFirmware(char *alias);
int xiaAddFirmwareItem(char *alias, char *name, void *value);
int xiaModifyFirmwareItem(char *alias, unsigned short decimation, char *name, void *value);
int xiaGetFirmwareItem(char *alias, unsigned short decimation, char *name, void *value); int xiaGetFirmwareItem(char *alias, unsigned short decimation, char *name, void *value);
int xiaGetNumFirmwareSets(unsigned int *numFirmware); int xiaGetNumFirmwareSets(unsigned int *numFirmware);
int xiaGetFirmwareSets(char *firmware[]); int xiaGetFirmwareSets(char *firmware[]);
int xiaGetFirmwareSets_VB(unsigned int index, char *alias); int xiaGetFirmwareSets_VB(unsigned int index, char *alias);
int xiaGetNumPTRRs(char *alias, unsigned int *numPTRR); int xiaGetNumPTRRs(char *alias, unsigned int *numPTRR);
int xiaRemoveFirmware(char *alias);
int xiaNewModule(char *alias);
int xiaAddModuleItem(char *alias, char *name, void *value);
int xiaModifyModuleItem(char *alias, char *name, void *value);
int xiaGetModuleItem(char *alias, char *name, void *value); int xiaGetModuleItem(char *alias, char *name, void *value);
int xiaGetNumModules(unsigned int *numModules); int xiaGetNumModules(unsigned int *numModules);
int xiaGetModules(char *modules[]); int xiaGetModules(char *modules[]);
int xiaGetModules_VB(unsigned int index, char *alias); int xiaGetModules_VB(unsigned int index, char *alias);
int xiaRemoveModule(char *alias);
int xiaModuleFromDetChan(int detChan, char *alias); int xiaModuleFromDetChan(int detChan, char *alias);
int xiaAddChannelSetElem(unsigned int detChanSet, unsigned int newChan);
int xiaRemoveChannelSetElem(unsigned int detChan, unsigned int chan);
int xiaRemoveChannelSet(unsigned int detChan);
int xiaStartSystem(void); int xiaStartSystem(void);
int xiaDownloadFirmware(int detChan, char *type);
int xiaSetAcquisitionValues(int detChan, char *name, void *value); int xiaSetAcquisitionValues(int detChan, char *name, void *value);
int xiaGetAcquisitionValues(int detChan, char *name, void *value); int xiaGetAcquisitionValues(int detChan, char *name, void *value);
int xiaRemoveAcquisitionValues(int detChan, char *name); int xiaRemoveAcquisitionValues(int detChan, char *name);
int xiaUpdateUserParams(int detChan);
int xiaGainOperation(int detChan, char *name, void *value); int xiaGainOperation(int detChan, char *name, void *value);
int xiaGainCalibrate(int detChan, double deltaGain); int xiaGainCalibrate(int detChan, double deltaGain);
int xiaStartRun(int detChan, unsigned short resume); int xiaStartRun(int detChan, unsigned short resume);
...@@ -64,8 +47,6 @@ int xiaGetParamName(int detChan, unsigned short index, char *name); ...@@ -64,8 +47,6 @@ int xiaGetParamName(int detChan, unsigned short index, char *name);
int xiaBoardOperation(int detChan, char *name, void *value); int xiaBoardOperation(int detChan, char *name, void *value);
int xiaMemoryOperation(int detChan, char *name, void *value); int xiaMemoryOperation(int detChan, char *name, void *value);
int xiaCommandOperation(int detChan, byte_t cmd, unsigned int lenS, byte_t *send, unsigned int lenR, byte_t *recv); int xiaCommandOperation(int detChan, byte_t cmd, unsigned int lenS, byte_t *send, unsigned int lenR, byte_t *recv);
int xiaFitGauss(long data[], int lower, int upper, float *pos, float *fwhm);
int xiaFindPeak(long *data, int numBins, float thresh, int *lower, int *upper);
int xiaExit(void); int xiaExit(void);
int xiaEnableLogOutput(void); int xiaEnableLogOutput(void);
int xiaSuppressLogOutput(void); int xiaSuppressLogOutput(void);
...@@ -74,9 +55,6 @@ int xiaSetLogOutput(char *fileName); ...@@ -74,9 +55,6 @@ int xiaSetLogOutput(char *fileName);
int xiaCloseLog(void); int xiaCloseLog(void);
int xiaSetIOPriority(int pri); int xiaSetIOPriority(int pri);
void xiaGetVersionInfo(int *rel, int *min, int *maj, char *pretty); void xiaGetVersionInfo(int *rel, int *min, int *maj, char *pretty);
int xiaMemStatistics(unsigned long *total, unsigned long *current, unsigned long *peak);
void xiaMemSetCheckpoint(void);
void xiaMemLeaks(char *);
""") """)
handel = ffi.dlopen("handel.dll") handel = ffi.dlopen("handel.dll")
...@@ -91,12 +91,6 @@ def exit(): ...@@ -91,12 +91,6 @@ def exit():
# Detectors # Detectors
def new_detector(alias):
alias = to_bytes(alias)
code = handel.xiaNewDetector(alias)
check_error(code)
def get_num_detectors(): def get_num_detectors():
num = ffi.new('unsigned int *') num = ffi.new('unsigned int *')
code = handel.xiaGetNumDetectors(num) code = handel.xiaGetNumDetectors(num)
...@@ -121,12 +115,8 @@ def get_detector_from_channel(channel): ...@@ -121,12 +115,8 @@ def get_detector_from_channel(channel):
# Not exposed # Not exposed
# int xiaAddDetectorItem(char *alias, char *name, void *value);
# int xiaModifyDetectorItem(char *alias, char *name, void *value);
# int xiaGetDetectorItem(char *alias, char *name, void *value); # int xiaGetDetectorItem(char *alias, char *name, void *value);
# int xiaGetDetectors_VB(unsigned int index, char *alias); # int xiaGetDetectors_VB(unsigned int index, char *alias);
# int xiaRemoveDetector(char *alias);
# Run control # Run control
...@@ -439,16 +429,11 @@ def close_log(): ...@@ -439,16 +429,11 @@ def close_log():
# Not exposed # Not exposed
# int xiaNewFirmware(char *alias);
# int xiaAddFirmwareItem(char *alias, char *name, void *value);
# int xiaModifyFirmwareItem(char *alias, unsigned short decimation, char *name, void *value);
# int xiaGetFirmwareItem(char *alias, unsigned short decimation, char *name, void *value); # int xiaGetFirmwareItem(char *alias, unsigned short decimation, char *name, void *value);
# int xiaGetNumFirmwareSets(unsigned int *numFirmware); # int xiaGetNumFirmwareSets(unsigned int *numFirmware);
# int xiaGetFirmwareSets(char *firmware[]); # int xiaGetFirmwareSets(char *firmware[]);
# int xiaGetFirmwareSets_VB(unsigned int index, char *alias); # int xiaGetFirmwareSets_VB(unsigned int index, char *alias);
# int xiaGetNumPTRRs(char *alias, unsigned int *numPTRR); # int xiaGetNumPTRRs(char *alias, unsigned int *numPTRR);
# int xiaRemoveFirmware(char *alias);
# int xiaDownloadFirmware(int detChan, char *type);
# Module # Module
...@@ -559,21 +544,8 @@ def get_trigger_channels(): ...@@ -559,21 +544,8 @@ def get_trigger_channels():
# Not exposed # Not exposed
# int xiaNewModule(char *alias);
# int xiaAddModuleItem(char *alias, char *name, void *value);
# int xiaModifyModuleItem(char *alias, char *name, void *value);
# int xiaGetModuleItem(char *alias, char *name, void *value); # int xiaGetModuleItem(char *alias, char *name, void *value);
# int xiaGetModules_VB(unsigned int index, char *alias); # int xiaGetModules_VB(unsigned int index, char *alias);
# int xiaRemoveModule(char *alias);
# Channel set
# Not exposed
# int xiaAddChannelSetElem(unsigned int detChanSet, unsigned int newChan);
# int xiaRemoveChannelSetElem(unsigned int detChan, unsigned int chan);
# int xiaRemoveChannelSet(unsigned int detChan);
# Parameters # Parameters
...@@ -633,7 +605,6 @@ def apply_acquisition_values(channel=None): ...@@ -633,7 +605,6 @@ def apply_acquisition_values(channel=None):
# Not exposed # Not exposed
# int xiaUpdateUserParams(int detChan);
# int xiaGainOperation(int detChan, char *name, void *value); # int xiaGainOperation(int detChan, char *name, void *value);
# int xiaGainCalibrate(int detChan, double deltaGain); # int xiaGainCalibrate(int detChan, double deltaGain);
# int xiaGetParameter(int detChan, const char *name, unsigned short *value); # int xiaGetParameter(int detChan, const char *name, unsigned short *value);
...@@ -652,14 +623,6 @@ def apply_acquisition_values(channel=None): ...@@ -652,14 +623,6 @@ def apply_acquisition_values(channel=None):
# int xiaCommandOperation(int detChan, byte_t cmd, unsigned int lenS, byte_t *send, unsigned int lenR, byte_t *recv); # int xiaCommandOperation(int detChan, byte_t cmd, unsigned int lenS, byte_t *send, unsigned int lenR, byte_t *recv);
# Analysis
# Not exposed
# int xiaFitGauss(long data[], int lower, int upper, float *pos, float *fwhm);
# int xiaFindPeak(long *data, int numBins, float thresh, int *lower, int *upper);
# Debugging # Debugging
...@@ -675,9 +638,6 @@ def get_handel_version(): ...@@ -675,9 +638,6 @@ def get_handel_version():
# Not exposed # Not exposed
# int xiaSetIOPriority(int pri); # int xiaSetIOPriority(int pri);
# int xiaMemStatistics(unsigned long *total, unsigned long *current, unsigned long *peak);
# void xiaMemSetCheckpoint(void);
# void xiaMemLeaks(char *);
# Files # Files
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment