Skip to content

F
FSI Data Acquisition Path Gateware and Software
Commit 617c9e83 authored by Juan David Gonzalez Cobas's avatar Juan David Gonzalez Cobas
Browse files
Options

Merge branch 'mateusz-comments-20210910' into fsi-lib 

Mateusz's comments over e-mail, Sep 10th, 2021, are incorporated in this
changeset.
parents 06ee437c 4ac65df5
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
libfsi/fsi.h
View file @ 617c9e83
......@@ -48,20 +48,17 @@ enum fsi_peak_type {
FSI_PEAK_GAUSS, /**< Gaussian (normal) distribution */
FSI_PEAK_SINC, /**< Sinc (sin(x)/x)) distribution */
FSI_PEAK_MOFFAT, /**< Moffat (power of Cauchy pdf) distribution */
FSI_PEAK_BRAGG, /**< Bragg-type peak */
/* FIXME:should Bragg type be set apart? tbd */
};
/** types of raw buffer requested by expert diagnostic functions */
enum fsi_expert_mode {
FSI_EXPERT_NONE = 0,
FSI_EXPERT_LIN_FFT, /**< buffer of linearized FFT data */
FSI_EXPERT_LIN_DATA, /**< does this mean linearized time-domain data? tbd */
FSI_EXPERT_LIN_DATA, /**< linearized time-domain data */
FSI_EXPERT_OSCILLOSCOPE, /**< oscilloscope mode - non-linearized raw signal */
FSI_EXPERT_GAS_CELL, /**< linearized input data buffer from gas cell */
FSI_EXPERT_INTERF, /**< linearized input data buffer from reference interferometer */
FSI_EXPERT_RAW_GAS_CELL, /**< non-linearized, raw input data buffer from gas cell */
FSI_EXPERT_RAW_INTERF, /**< non-linearized, raw input data buffer from reference interferometer */
FSI_EXPERT_OSC_BRAGG, /**< tbd - no different from FSI_EXPERT_OSCILLOSCOPE? */
};
/** biggest number of model parameters among different peak types */
......@@ -72,6 +69,9 @@ enum fsi_expert_mode {
#define FSI_PEAK_LENGTH 200
/** size of sample vectors - this should not be hardcoded - tbd */
#define FSI_SAMPLE_SIZE 1024
#define FSI_BYTES_PER_SAMPLE 2
#define FSI_SAMPLE_SIZE_BYTES (FSI_SAMPLE_SIZE*FSI_SAMPLE_SIZE_BYTES)
/** amount of reserved bytes for hardware diagnostics */
#define FSI_HW_DIAG_SIZE 16
......@@ -86,7 +86,6 @@ enum fsi_expert_mode {
struct fsi_peak_config {
double frequency; /**< estimated frequency where peak fits */
double range1, range2; /**< estimated interval of peak range */
double channel_gain; /**< FIXME: should be per-channel, not per-peak? */
enum fsi_peak_type type; /**< shape of peak to fit */
};
......@@ -115,12 +114,10 @@ struct fsi_peak_result {
struct fsi_channel_config {
unsigned int channel_id; /**< channel to be configured */
enum fsi_channel_type type; /**< type of channel (distance/Bragg) */
double channel_gain; /**< channel gain FIXME: see fsi_peak_request */
int npeaks; /**< number of valid peaks to be requested in peaks array */
int channel_gain; /**< bool: *do* make use of channel gain */
struct fsi_peak_config
peaks[FSI_MAX_PEAKS]; /**< peak requests
FIXME: should peak params be identical for all of them?
If so, this needs not be an array and npeaks is sufficient */
peaks[FSI_MAX_PEAKS]; /**< peak requests (each peak has separate params */
};
/**
......
Markdown is supported
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