diff --git a/slsDetectorSoftware/bin/libSlsDetector.so.1.0.1 b/slsDetectorSoftware/bin/libSlsDetector.so.1.0.1 index f1492224c..c67f4d11a 100755 Binary files a/slsDetectorSoftware/bin/libSlsDetector.so.1.0.1 and b/slsDetectorSoftware/bin/libSlsDetector.so.1.0.1 differ diff --git a/slsDetectorSoftware/commonFiles/sls_detector_defs.h b/slsDetectorSoftware/commonFiles/sls_detector_defs.h index db20a7f76..ce40f56b5 100755 --- a/slsDetectorSoftware/commonFiles/sls_detector_defs.h +++ b/slsDetectorSoftware/commonFiles/sls_detector_defs.h @@ -152,7 +152,8 @@ enum dimension { */ enum { OK, /**< function succeeded */ - FAIL /**< function failed */ + FAIL, /**< function failed */ + FINISHED /**< function failed */ }; /** @@ -294,6 +295,15 @@ enum timerIndex { CYCLES_NUMBER /**< number of cycles: total number of acquisitions is number or frames*number of cycles */ }; +/** + important speed parameters +*/ +enum speedVariable { + CLOCK_DIVIDER, /**< readout clock divider */ + WAIT_STATES, /**< wait states for bus read */ + SET_SIGNAL_LENGTH /**< set/clear signal length */ +}; + /** readout flags */ @@ -350,7 +360,6 @@ enum { F_SET_EXTERNAL_COMMUNICATION_MODE, /**< set/get external communication mode (obsolete) */ - // Tests and identification F_GET_ID, /**< get detector id of version */ @@ -405,6 +414,8 @@ enum { F_SET_READOUT_FLAGS, /**< set/get readout flags */ F_SET_ROI, /**< set/get region of interest */ + F_SET_SPEED, /**< set/get readout speed parameters */ + //Trimming F_EXECUTE_TRIMMING, /**< execute trimming */ diff --git a/slsDetectorSoftware/docs/html/MySocketTCP_8cxx.html b/slsDetectorSoftware/docs/html/MySocketTCP_8cxx.html index eefa5dba5..995e4c29b 100644 --- a/slsDetectorSoftware/docs/html/MySocketTCP_8cxx.html +++ b/slsDetectorSoftware/docs/html/MySocketTCP_8cxx.html @@ -25,7 +25,7 @@
-
Generated on Fri Oct 9 16:01:04 2009 by  +
Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
diff --git a/slsDetectorSoftware/docs/html/MySocketTCP_8h-source.html b/slsDetectorSoftware/docs/html/MySocketTCP_8h-source.html index 3a99da11f..7bcdc24fa 100644 --- a/slsDetectorSoftware/docs/html/MySocketTCP_8h-source.html +++ b/slsDetectorSoftware/docs/html/MySocketTCP_8h-source.html @@ -108,7 +108,7 @@ 00088 00089 }; 00090 #endif -
Generated on Fri Oct 9 16:01:04 2009 by  +
Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
diff --git a/slsDetectorSoftware/docs/html/MySocketTCP_8h.html b/slsDetectorSoftware/docs/html/MySocketTCP_8h.html index 86e560077..24e9ec6c8 100644 --- a/slsDetectorSoftware/docs/html/MySocketTCP_8h.html +++ b/slsDetectorSoftware/docs/html/MySocketTCP_8h.html @@ -67,7 +67,7 @@

-

Generated on Fri Oct 9 16:01:04 2009 by  +
Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
diff --git a/slsDetectorSoftware/docs/html/annotated.html b/slsDetectorSoftware/docs/html/annotated.html index 70855c713..eb80d7c73 100644 --- a/slsDetectorSoftware/docs/html/annotated.html +++ b/slsDetectorSoftware/docs/html/annotated.html @@ -24,7 +24,7 @@ eigerDetectorThis is class contains all eiger specific functionalities iarray MySocketTCP - mythenDetectorThis calss contains all mythen specific functions + mythenDetector ROI sls_detector_channel sls_detector_chip @@ -32,7 +32,7 @@ slsDetectorThis is the base class for all SLS detector functionalities slsDetector::sharedSlsDetectorStructure allocated in shared memory to store detector settings and be accessed in parallel by several applications (take care of possible conflicts!) -
Generated on Fri Oct 9 16:01:04 2009 by  +
Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
diff --git a/slsDetectorSoftware/docs/html/bug.html b/slsDetectorSoftware/docs/html/bug.html index 4e4a6acee..9ca8892d3 100644 --- a/slsDetectorSoftware/docs/html/bug.html +++ b/slsDetectorSoftware/docs/html/bug.html @@ -14,10 +14,10 @@
  • Related Pages

    • Bug List

    -
    Member slsDetector::getChip (int ichip, int imod)
    +
    Member slsDetector::getChip (int ichip, int imod)
    probably does not return corretly!
    -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/classMySocketTCP-members.html b/slsDetectorSoftware/docs/html/classMySocketTCP-members.html index 0e2acde0e..706a079a0 100644 --- a/slsDetectorSoftware/docs/html/classMySocketTCP-members.html +++ b/slsDetectorSoftware/docs/html/classMySocketTCP-members.html @@ -43,7 +43,7 @@ serverAddressMySocketTCP [private] socketDescriptorMySocketTCP [private] ~MySocketTCP()MySocketTCP -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/classMySocketTCP.html b/slsDetectorSoftware/docs/html/classMySocketTCP.html index 95cdeae8b..c327f12a6 100644 --- a/slsDetectorSoftware/docs/html/classMySocketTCP.html +++ b/slsDetectorSoftware/docs/html/classMySocketTCP.html @@ -550,7 +550,7 @@

    The documentation for this class was generated from the following files: -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/classeigerDetector-members.html b/slsDetectorSoftware/docs/html/classeigerDetector-members.html index b2daf2be8..cb240e402 100644 --- a/slsDetectorSoftware/docs/html/classeigerDetector-members.html +++ b/slsDetectorSoftware/docs/html/classeigerDetector-members.html @@ -20,15 +20,29 @@
  • Class Members

    • eigerDetector Member List

    This is the complete list of members for eigerDetector, including all inherited members.

    - - + + + + + + + - + + + + + + + + + + - + @@ -36,70 +50,88 @@ + + + + - + + + - + - - - + + + - + - + - - + + - - + - + + + + + + + + + - + - - - - - + + + + + - - - - + + + + + + + + + + - + - @@ -109,41 +141,45 @@ - + - + - + - + + + - - - - - + + + + + + + - - + + -
    acquire()slsDetector
    addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv, float *me, int *mm)slsDetector
    acquire()=0slsDetector [pure virtual]
    adcsslsDetector [protected]
    addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv, float *me, int *mm)=0slsDetector [pure virtual]
    analogTest(analogTestMode mode)slsDetector
    badChannelMaskslsDetector [protected]
    chanregsslsDetector [protected]
    chipregsslsDetector [protected]
    controlSocketslsDetector [protected]
    createFileName()slsDetector
    createModule()slsDetector
    createModule()slsDetector
    currentI0slsDetector [protected]
    currentPositionslsDetector [protected]
    currentPositionIndexslsDetector [protected]
    dacsslsDetector [protected]
    dataProcessingThreadslsDetector [protected]
    dataQueueslsDetector [protected]
    dataSocketslsDetector [protected]
    decodeData(int *datain)eigerDetector
    deleteModule(sls_detector_module *myMod)slsDetector
    detectorModulesslsDetector [protected]
    detIdslsDetector [protected]
    digitalTest(digitalTestMode mode, int imod=0)slsDetector
    dumpDetectorSetup(string const fname)slsDetector
    dumpDetectorSetup(string const fname)=0slsDetector [pure virtual]
    eigerDetector(int id=0)eigerDetector
    enableAnalogOutput(int ichan)slsDetector
    enableAnalogOutput(int imod, int ichip, int ichan)slsDetector
    executeTrimming(trimMode mode, int par1, int par2, int imod=-1)slsDetector
    exists()slsDetector [inline]
    exitServer()slsDetector
    ffcoefficientsslsDetector [protected]
    fferrorsslsDetector [protected]
    fillBadChannelMask()slsDetector [protected]
    finalizeMerging(float *mp, float *mv, float *me, int *mm)slsDetector
    flatFieldCorrect(float datain, float errin, float &dataout, float &errout, float ffcoefficient, float fferr)slsDetector
    flatFieldCorrect(float *datain, float *errin, float *dataout, float *errout)slsDetector
    freeSharedMemory()slsDetector [protected]
    GET_ONLINE_FLAG enum valueslsDetector
    getADC(dacIndex index, int imod=0)slsDetector
    getAngularConversion(int &direction, angleConversionConstant *angconv=NULL)slsDetector
    getAngularConversion(int &direction, angleConversionConstant *angconv=NULL)=0slsDetector [pure virtual]
    getAngularConversion()=0slsDetector [pure virtual]
    getBadChannelCorrectionFile()slsDetector [inline]
    getBadChannelCorrections(int *bad=NULL)slsDetector
    getBinSize()slsDetector [inline]
    getBinSize()=0slsDetector [pure virtual]
    getCalDir()slsDetector [inline]
    getChannel(int ichan, int ichip, int imod)slsDetector
    getChip(int ichip, int imod)slsDetector
    getClockDivider()slsDetector [inline]
    getChannel(int ichan, int ichip, int imod)slsDetector
    getChip(int ichip, int imod)slsDetector
    getControlPort()slsDetector [inline]
    getDataFromDetector()slsDetector [protected]
    getDataFromDetectorNoWait()slsDetector
    getDataPort()slsDetector [inline]
    getDetectorType(char *type)slsDetector
    getFileIndex()slsDetector [inline]
    getFileName()slsDetector [inline]
    getFilePath()slsDetector [inline]
    getFineOffset()slsDetector [inline]
    getFineOffset()=0slsDetector [pure virtual]
    getFlatFieldCorrections(float *corr=NULL, float *ecorr=NULL)slsDetector
    getGlobalOffset()slsDetector [inline]
    getGlobalOffset()=0slsDetector [pure virtual]
    getHostname()slsDetector [inline]
    getId(idMode mode, int imod=0)slsDetector
    getMaxNumberOfModules(dimension d=X)slsDetector
    getModule(int imod)slsDetector
    getPositions(float *pos=NULL)slsDetector [inline]
    getModule(int imod)slsDetector
    getPositions(float *pos=NULL)=0slsDetector [pure virtual]
    getRateCorrections(float &t)slsDetector
    getRateCorrections()slsDetector
    getRunStatus()slsDetector
    getSetLength()slsDetector [inline]
    getSettings(int imod=-1)slsDetector
    getSettings(int imod=-1)slsDetector
    getStopPort()slsDetector [inline]
    getThresholdEnergy(int imod=-1)slsDetector
    getTimeLeft(timerIndex index)slsDetector
    getTrimDir()slsDetector [inline]
    getTrimEn(int *en)slsDetector [inline]
    getTrimEn(int *en=NULL)slsDetector [inline]
    giveCalibrationPulse(float vcal, int npulses)slsDetector
    initializeDetectorSize(detectorType type)slsDetector [protected]
    initializeDetectorStructure()slsDetector [protected]
    initSharedMemory(detectorType type=GENERIC, int id=0)slsDetector [protected]
    mergingBinsslsDetector [protected]
    mergingCountsslsDetector [protected]
    mergingErrorsslsDetector [protected]
    mergingMultiplicityslsDetector [protected]
    OFFLINE_FLAG enum valueslsDetector
    ONLINE_FLAG enum valueslsDetector
    onlineFlagslsDetector [protected]
    popDataQueue()slsDetector
    processData()slsDetector
    processData()=0slsDetector [pure virtual]
    rateCorrect(float datain, float errin, float &dataout, float &errout, float tau, float t)slsDetector
    rateCorrect(float *datain, float *errin, float *dataout, float *errout)slsDetector
    readAll()slsDetector
    readAngularConversion(string fname="")slsDetector
    readCalibrationFile(string fname, float &gain, float &offset)eigerDetector
    readConfigurationFile(string const fname)slsDetector
    readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0)eigerDetector
    readDataFile(string fname, int *data)eigerDetector
    readAngularConversion(string fname="")=0slsDetector [pure virtual]
    readCalibrationFile(string fname, float &gain, float &offset)eigerDetector [virtual]
    readConfigurationFile(string const fname)=0slsDetector [pure virtual]
    readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0)eigerDetector [virtual]
    readDataFile(string fname, int *data)eigerDetector [virtual]
    readFrame()slsDetector
    readRegister(int addr)slsDetector
    readTrimFile(string fname, sls_detector_module *myMod=NULL)eigerDetector
    resetMerging(float *mp, float *mv, float *me, int *mm)slsDetector
    retrieveDetectorSetup(string const fname)slsDetector
    setAngularConversion(string fname="")slsDetector
    readTrimFile(string fname, sls_detector_module *myMod=NULL)eigerDetector [virtual]
    receiveChannel(sls_detector_channel *)slsDetector [protected]
    receiveChip(sls_detector_chip *)slsDetector [protected]
    receiveModule(sls_detector_module *)slsDetector [protected]
    resetMerging(float *mp, float *mv, float *me, int *mm)=0slsDetector [pure virtual]
    retrieveDetectorSetup(string const fname)=0slsDetector [pure virtual]
    sendChannel(sls_detector_channel *)slsDetector [protected]
    sendChip(sls_detector_chip *)slsDetector [protected]
    sendModule(sls_detector_module *)slsDetector [protected]
    setAngularConversion(string fname="")=0slsDetector [pure virtual]
    setBadChannelCorrection(string fname="")slsDetector
    setBinSize(float bs)slsDetector [inline]
    setBinSize(float bs)=0slsDetector [pure virtual]
    setCalDir(string s)slsDetector [inline]
    setChannel(int64_t reg, int ichan=-1, int ichip=-1, int imod=-1)slsDetector
    setChannel(sls_detector_channel chan)slsDetector
    setChip(int reg, int ichip=-1, int imod=-1)slsDetector
    setChip(sls_detector_chip chip)slsDetector
    setClockDivider(int i)slsDetector [inline]
    setDAC(float val, dacIndex index, int imod=-1)slsDetector
    setDetectorType(detectorType type=GET_DETECTOR_TYPE)slsDetector
    setDetectorType(string type)slsDetector
    setFileIndex(int i)slsDetector [inline]
    setFileName(string s)slsDetector [inline]
    setFilePath(string s)slsDetector [inline]
    setFineOffset(float f)slsDetector [inline]
    setFineOffset(float f)=0slsDetector [pure virtual]
    setFlatFieldCorrection(string fname="")slsDetector
    setGlobalOffset(float f)slsDetector [inline]
    setGlobalOffset(float f)=0slsDetector [pure virtual]
    setModule(int reg, int imod=-1)slsDetector
    setModule(sls_detector_module module)slsDetector
    setNumberOfModules(int n, dimension d=X)slsDetector
    setOnline(int const online)slsDetector
    setPositions(int nPos, float *pos)slsDetector [inline]
    setPositions(int nPos, float *pos)=0slsDetector [pure virtual]
    setRateCorrection(float t=0)slsDetector
    setReadOutFlags(readOutFlags flag)slsDetector
    setROI(int nroi=-1, int *xmin=NULL, int *xmax=NULL, int *ymin=NULL, int *ymax=NULL)slsDetector
    setSetLength(int i)slsDetector [inline]
    setSettings(detectorSettings isettings, int imod=-1)slsDetector
    setSpeed(speedVariable sp, int value=-1)slsDetector
    setTCPSocket(string const name="", int const control_port=-1, int const stop_port=-1, int const data_port=-1)slsDetector
    setThresholdEnergy(int e_eV, int imod=-1, detectorSettings isettings=GET_SETTINGS)slsDetector
    setTimer(timerIndex index, int64_t t=-1)slsDetector
    setTrimDir(string s)slsDetector [inline]
    sharedSlsDetector typedefslsDetector
    shmIdslsDetector [protected]
    slsDetector(detectorType type=GENERIC, int id=0)slsDetector
    startAcquisition()slsDetector
    startAndReadAll()slsDetector
    startAndReadAllNoWait()slsDetector
    startReadOut()slsDetector
    startThread()slsDetector [protected]
    stopAcquisition()slsDetector
    writeAngularConversion(string fname="")slsDetector
    writeCalibrationFile(string fname, float gain, float offset)eigerDetector
    writeConfigurationFile(string const fname)slsDetector
    writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1)eigerDetector
    writeDataFile(string fname, int *data)eigerDetector
    stopSocketslsDetector [protected]
    thisDetectorslsDetector [protected]
    writeAngularConversion(string fname="")=0slsDetector [pure virtual]
    writeCalibrationFile(string fname, float gain, float offset)eigerDetector [virtual]
    writeConfigurationFile(string const fname)=0slsDetector [pure virtual]
    writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1)eigerDetector [virtual]
    writeDataFile(string fname, int *data)eigerDetector [virtual]
    writeRegister(int addr, int val)slsDetector
    writeTrimFile(string fname, sls_detector_module mod)eigerDetector
    writeTrimFile(string fname, int imod)eigerDetector
    writeTrimFile(string fname, sls_detector_module mod)eigerDetector [virtual]
    writeTrimFile(string fname, int imod)eigerDetector [virtual]
    ~eigerDetector()eigerDetector [inline]
    ~slsDetector()slsDetector [inline]

    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/classeigerDetector.html b/slsDetectorSoftware/docs/html/classeigerDetector.html index 20f56c637..8102e1548 100644 --- a/slsDetectorSoftware/docs/html/classeigerDetector.html +++ b/slsDetectorSoftware/docs/html/classeigerDetector.html @@ -165,7 +165,7 @@ Reimplemented from + [virtual] @@ -182,7 +182,7 @@ int sharedSlsDetector

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -204,7 +204,7 @@ Reimplemented from + [virtual] @@ -220,7 +220,7 @@ reads a data file

    Parameters:
    Returns:
    OK or FAIL if it could not read the file or data=NULL

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -266,7 +266,7 @@ Reimplemented from + [virtual] @@ -286,7 +286,7 @@ reads a data file

    Parameters:
    Returns:
    OK or FAIL if it could not read the file or data=NULL

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -308,7 +308,7 @@ Reimplemented from + [virtual] @@ -325,7 +325,7 @@ reads a trim file

    Parameters:
    Returns:
    the pointer to myMod or NULL if reading the file failed

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -353,7 +353,7 @@ Reimplemented from + [virtual] @@ -370,7 +370,7 @@ writes a clibration file

    Parameters:
    See also:
    sharedSlsDetector

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -392,7 +392,7 @@ Reimplemented from + [virtual] @@ -408,7 +408,7 @@ writes a data file

    Parameters:
    Returns:
    OK or FAIL if it could not write the file or data=NULL

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -454,7 +454,7 @@ Reimplemented from + [virtual] @@ -474,7 +474,7 @@ writes a data file

    Parameters:
    Returns:
    OK or FAIL if it could not write the file or data=NULL

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -496,7 +496,7 @@ Reimplemented from + [virtual] @@ -513,7 +513,7 @@ writes a trim file for module number imod - the values will be read from the cur

    See also:
    sls_detector_module sharedSlsDetector

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -535,7 +535,7 @@ Reimplemented from + [virtual] @@ -552,12 +552,12 @@ writes a trim file

    Parameters:
    See also:
    sls_detector_module

    -Reimplemented from slsDetector. +Implements slsDetector.

    The documentation for this class was generated from the following file: -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/classmythenDetector-members.html b/slsDetectorSoftware/docs/html/classmythenDetector-members.html index 283b52963..a79c4d5ec 100644 --- a/slsDetectorSoftware/docs/html/classmythenDetector-members.html +++ b/slsDetectorSoftware/docs/html/classmythenDetector-members.html @@ -20,86 +20,117 @@
  • Class Members

    • mythenDetector Member List

    This is the complete list of members for mythenDetector, including all inherited members.

    - - + + + + + + + - - + + + + + + + + + + + - + + + + + - + + + - + - - - + + + - + - + - - + + - - + - + - + + + + + + + + - + - - - - - + + + + + - - - - + + + + + + + + + + - + - @@ -109,41 +140,44 @@ - + - + - + - + + + - - - - - + + + + + + + - - - + + -
    acquire()slsDetector
    addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv, float *me, int *mm)mythenDetector
    acquire()mythenDetector [virtual]
    adcsslsDetector [protected]
    addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv, float *me, int *mm)mythenDetector [virtual]
    analogTest(analogTestMode mode)slsDetector
    badChannelMaskslsDetector [protected]
    chanregsslsDetector [protected]
    chipregsslsDetector [protected]
    controlSocketslsDetector [protected]
    createFileName()slsDetector
    createModule()slsDetector
    decodeData(int *datain)mythenDetector
    createModule()slsDetector
    currentI0slsDetector [protected]
    currentPositionslsDetector [protected]
    currentPositionIndexslsDetector [protected]
    dacsslsDetector [protected]
    dataProcessingThreadslsDetector [protected]
    dataQueueslsDetector [protected]
    dataSocketslsDetector [protected]
    decodeData(int *datain)slsDetector
    deleteModule(sls_detector_module *myMod)slsDetector
    detectorModulesslsDetector [protected]
    detIdslsDetector [protected]
    digitalTest(digitalTestMode mode, int imod=0)slsDetector
    dumpDetectorSetup(string const fname)slsDetector
    dumpDetectorSetup(string const fname)mythenDetector [virtual]
    enableAnalogOutput(int ichan)slsDetector
    enableAnalogOutput(int imod, int ichip, int ichan)slsDetector
    execCommand(string cmd, string answer)slsDetector
    executeTrimming(trimMode mode, int par1, int par2, int imod=-1)slsDetector
    exists()slsDetector [inline]
    exitServer()slsDetector
    ffcoefficientsslsDetector [protected]
    fferrorsslsDetector [protected]
    fillBadChannelMask()slsDetector [protected]
    finalizeMerging(float *mp, float *mv, float *me, int *mm)mythenDetector
    flatFieldCorrect(float datain, float errin, float &dataout, float &errout, float ffcoefficient, float fferr)slsDetector
    flatFieldCorrect(float *datain, float *errin, float *dataout, float *errout)slsDetector
    freeSharedMemory()slsDetector [protected]
    GET_ONLINE_FLAG enum valueslsDetector
    getADC(dacIndex index, int imod=0)slsDetector
    getAngularConversion(int &direction, angleConversionConstant *angconv=NULL)mythenDetector
    getAngularConversion(int &direction, angleConversionConstant *angconv=NULL)mythenDetector [virtual]
    getAngularConversion()mythenDetector [inline, virtual]
    getBadChannelCorrectionFile()slsDetector [inline]
    getBadChannelCorrections(int *bad=NULL)slsDetector
    getBinSize()mythenDetector [inline]
    getBinSize()mythenDetector [inline, virtual]
    getCalDir()slsDetector [inline]
    getChannel(int ichan, int ichip, int imod)slsDetector
    getChip(int ichip, int imod)slsDetector
    getClockDivider()slsDetector [inline]
    getChannel(int ichan, int ichip, int imod)slsDetector
    getChip(int ichip, int imod)slsDetector
    getControlPort()slsDetector [inline]
    getDataFromDetector()slsDetector [protected]
    getDataFromDetectorNoWait()slsDetector
    getDataPort()slsDetector [inline]
    getDetectorType(char *type)slsDetector
    getFileIndex()slsDetector [inline]
    getFileName()slsDetector [inline]
    getFilePath()slsDetector [inline]
    getFineOffset()mythenDetector [inline]
    getFineOffset()mythenDetector [inline, virtual]
    getFlatFieldCorrections(float *corr=NULL, float *ecorr=NULL)slsDetector
    getGlobalOffset()mythenDetector [inline]
    getGlobalOffset()mythenDetector [inline, virtual]
    getHostname()slsDetector [inline]
    getId(idMode mode, int imod=0)slsDetector
    getMaxNumberOfModules(dimension d=X)slsDetector
    getModule(int imod)slsDetector
    getPositions(float *pos=NULL)mythenDetector [inline]
    getModule(int imod)slsDetector
    getPositions(float *pos=NULL)mythenDetector [inline, virtual]
    getRateCorrections(float &t)slsDetector
    getRateCorrections()slsDetector
    getRunStatus()slsDetector
    getSetLength()slsDetector [inline]
    getSettings(int imod=-1)slsDetector
    getSettings(int imod=-1)slsDetector
    getStopPort()slsDetector [inline]
    getThresholdEnergy(int imod=-1)slsDetector
    getTimeLeft(timerIndex index)slsDetector
    getTrimDir()slsDetector [inline]
    getTrimEn(int *en)slsDetector [inline]
    getTrimEn(int *en=NULL)slsDetector [inline]
    giveCalibrationPulse(float vcal, int npulses)slsDetector
    mythenDetector(int id=0)mythenDetector
    initializeDetectorSize(detectorType type)slsDetector [protected]
    initializeDetectorStructure()slsDetector [protected]
    initSharedMemory(detectorType type=GENERIC, int id=0)slsDetector [protected]
    mergingBinsslsDetector [protected]
    mergingCountsslsDetector [protected]
    mergingErrorsslsDetector [protected]
    mergingMultiplicityslsDetector [protected]
    OFFLINE_FLAG enum valueslsDetector
    ONLINE_FLAG enum valueslsDetector
    onlineFlagslsDetector [protected]
    popDataQueue()slsDetector
    processData()slsDetector
    processData()mythenDetector [virtual]
    rateCorrect(float datain, float errin, float &dataout, float &errout, float tau, float t)slsDetector
    rateCorrect(float *datain, float *errin, float *dataout, float *errout)slsDetector
    readAll()slsDetector
    readAngularConversion(string fname="")mythenDetector
    readCalibrationFile(string fname, float &gain, float &offset)mythenDetector
    readConfigurationFile(string const fname)slsDetector
    readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0)mythenDetector
    readDataFile(string fname, int *data)mythenDetector
    readAngularConversion(string fname="")mythenDetector [virtual]
    readCalibrationFile(string fname, float &gain, float &offset)mythenDetector [virtual]
    readConfigurationFile(string const fname)mythenDetector [virtual]
    readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0)mythenDetector [virtual]
    readDataFile(string fname, int *data)mythenDetector [virtual]
    readFrame()slsDetector
    readRegister(int addr)slsDetector
    readTrimFile(string fname, sls_detector_module *myMod=NULL)mythenDetector
    resetMerging(float *mp, float *mv, float *me, int *mm)mythenDetector
    retrieveDetectorSetup(string const fname)slsDetector
    setAngularConversion(string fname="")mythenDetector
    readTrimFile(string fname, sls_detector_module *myMod=NULL)mythenDetector [virtual]
    receiveChannel(sls_detector_channel *)slsDetector [protected]
    receiveChip(sls_detector_chip *)slsDetector [protected]
    receiveModule(sls_detector_module *)slsDetector [protected]
    resetMerging(float *mp, float *mv, float *me, int *mm)mythenDetector [virtual]
    retrieveDetectorSetup(string const fname)mythenDetector [virtual]
    sendChannel(sls_detector_channel *)slsDetector [protected]
    sendChip(sls_detector_chip *)slsDetector [protected]
    sendModule(sls_detector_module *)slsDetector [protected]
    setAngularConversion(string fname="")mythenDetector [virtual]
    setBadChannelCorrection(string fname="")slsDetector
    setBinSize(float bs)mythenDetector [inline]
    setBinSize(float bs)mythenDetector [inline, virtual]
    setCalDir(string s)slsDetector [inline]
    setChannel(int64_t reg, int ichan=-1, int ichip=-1, int imod=-1)slsDetector
    setChannel(sls_detector_channel chan)slsDetector
    setChip(int reg, int ichip=-1, int imod=-1)slsDetector
    setChip(sls_detector_chip chip)slsDetector
    setClockDivider(int i)slsDetector [inline]
    setDAC(float val, dacIndex index, int imod=-1)slsDetector
    setDetectorType(detectorType type=GET_DETECTOR_TYPE)slsDetector
    setDetectorType(string type)slsDetector
    setFileIndex(int i)slsDetector [inline]
    setFileName(string s)slsDetector [inline]
    setFilePath(string s)slsDetector [inline]
    setFineOffset(float f)mythenDetector [inline]
    setFineOffset(float f)mythenDetector [inline, virtual]
    setFlatFieldCorrection(string fname="")slsDetector
    setGlobalOffset(float f)mythenDetector [inline]
    setGlobalOffset(float f)mythenDetector [inline, virtual]
    setModule(int reg, int imod=-1)slsDetector
    setModule(sls_detector_module module)slsDetector
    setNumberOfModules(int n, dimension d=X)slsDetector
    setOnline(int const online)slsDetector
    setPositions(int nPos, float *pos)mythenDetector [inline]
    setPositions(int nPos, float *pos)mythenDetector [inline, virtual]
    setRateCorrection(float t=0)slsDetector
    setReadOutFlags(readOutFlags flag)slsDetector
    setROI(int nroi=-1, int *xmin=NULL, int *xmax=NULL, int *ymin=NULL, int *ymax=NULL)slsDetector
    setSetLength(int i)slsDetector [inline]
    setSettings(detectorSettings isettings, int imod=-1)slsDetector
    setSpeed(speedVariable sp, int value=-1)slsDetector
    setTCPSocket(string const name="", int const control_port=-1, int const stop_port=-1, int const data_port=-1)slsDetector
    setThresholdEnergy(int e_eV, int imod=-1, detectorSettings isettings=GET_SETTINGS)slsDetector
    setTimer(timerIndex index, int64_t t=-1)slsDetector
    setTrimDir(string s)slsDetector [inline]
    sharedSlsDetector typedefslsDetector
    shmIdslsDetector [protected]
    slsDetector(detectorType type=GENERIC, int id=0)slsDetector
    startAcquisition()slsDetector
    startAndReadAll()slsDetector
    startAndReadAllNoWait()slsDetector
    startReadOut()slsDetector
    startThread()slsDetector [protected]
    stopAcquisition()slsDetector
    writeAngularConversion(string fname="")mythenDetector
    writeCalibrationFile(string fname, float gain, float offset)mythenDetector
    writeConfigurationFile(string const fname)slsDetector
    writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1)mythenDetector
    writeDataFile(string fname, int *data)mythenDetector
    stopSocketslsDetector [protected]
    thisDetectorslsDetector [protected]
    writeAngularConversion(string fname="")mythenDetector [virtual]
    writeCalibrationFile(string fname, float gain, float offset)mythenDetector [virtual]
    writeConfigurationFile(string const fname)mythenDetector [virtual]
    writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1)mythenDetector [virtual]
    writeDataFile(string fname, int *data)mythenDetector [virtual]
    writeRegister(int addr, int val)slsDetector
    writeTrimFile(string fname, sls_detector_module mod)mythenDetector
    writeTrimFile(string fname, int imod)mythenDetector
    ~mythenDetector()mythenDetector [inline]
    writeTrimFile(string fname, sls_detector_module mod)mythenDetector [virtual]
    writeTrimFile(string fname, int imod)mythenDetector [virtual]
    ~slsDetector()slsDetector [inline]

    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/classmythenDetector.html b/slsDetectorSoftware/docs/html/classmythenDetector.html index 605918732..d1de0e6bf 100644 --- a/slsDetectorSoftware/docs/html/classmythenDetector.html +++ b/slsDetectorSoftware/docs/html/classmythenDetector.html @@ -19,10 +19,7 @@
  • Class Hierarchy
  • Class Members
    • -

    mythenDetector Class Reference

    This calss contains all mythen specific functions. -More... -

    -#include <mythenDetector.h> +

    mythenDetector Class Reference

    #include <mythenDetector.h>

    Inheritance diagram for mythenDetector:

    @@ -32,9 +29,13 @@ List of all members. - + - + + + + + @@ -62,6 +63,8 @@ + + @@ -78,70 +81,43 @@ - - + + + +

    Public Member Functions

     mythenDetector (int id=0)
    int readConfigurationFile (string const fname)
     ~mythenDetector ()
    int writeConfigurationFile (string const fname)
    int dumpDetectorSetup (string const fname)
    int retrieveDetectorSetup (string const fname)
    sls_detector_module * readTrimFile (string fname, sls_detector_module *myMod=NULL)
    int getAngularConversion (int &direction, angleConversionConstant *angconv=NULL)
    char * getAngularConversion ()
    float setGlobalOffset (float f)
    float setFineOffset (float f)
    float getBinSize ()
    float * decodeData (int *datain)
    int resetMerging (float *mp, float *mv, float *me, int *mm)
    int addToMerging (float *p1, float *v1, float *e1, float *mp, float *mv, float *me, int *mm)
    int finalizeMerging (float *mp, float *mv, float *me, int *mm)
    void * processData ()
    void acquire ()
    -

    Detailed Description

    -This calss contains all mythen specific functions. -

    -The mythenDetector class contains the functions specific to the mythen detector

    -

    Author:
    Anna Bergamaschi
    -
    Version:
    0.1alpha (any string)
    - -

    -

    Constructor & Destructor Documentation

    - +

    Member Function Documentation

    +
    - - - - - - - -
    mythenDetector::mythenDetector (int  id = 0  ) 
    -
    -
    - -

    -(default) constructor

    -

    Parameters:
    - - -
    id is the detector index which is needed to define the shared memory id. Different physical detectors should have different IDs in order to work independently
    -
    - -
    -

    - -

    -
    - - - + - +
    mythenDetector::~mythenDetector void mythenDetector::acquire (  )  [inline] [virtual]

    -destructor +performs the complete acquisition and data processing moves the detector to next position
    + starts and reads the detector
    + reads the IC (if required)
    + reads the encoder (iof required for angualr conversion)
    + processes the data (flat field, rate, angular conversion and merging processData()) +

    +Implements slsDetector.

    -

    Member Function Documentation

    @@ -191,14 +167,14 @@ destructor ) - + [virtual]

    -not yet implemented merge dataset

    Parameters:
    +merge dataset
    Parameters:
    @@ -211,35 +187,30 @@ not yet implemented merge dataset
    Parameters:

    -Reimplemented from slsDetector. +Implements slsDetector.

    - +

    p1 angular positions of dataset
    v1 data
    - + - - + + - +
    float* mythenDetector::decodeData int mythenDetector::dumpDetectorSetup (int *  datain string const   fname  )  [virtual]

    -decode data from the detector converting them to an array of floats, one for each channle

    Parameters:
    - - -
    datain data from the detector
    -
    -
    Returns:
    pointer to a float array with a data per channel
    - +not yet implemented

    +should dump to a file all the current detector parameters

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -294,6 +265,27 @@ calculates the "final" positions, data value and errors for the emrged data

    slsDetector.

    + +

    +
    + + + + + + + + +
    char* mythenDetector::getAngularConversion (  )  [inline, virtual]
    +
    +
    + +

    +returns the angular conversion file +

    +Implements slsDetector. +

    +

    @@ -313,7 +305,7 @@ Reimplemented from + [virtual]
    @@ -329,7 +321,7 @@ get angular conversion
    Parameters:
    Returns:
    0 if angular conversion disabled, >0 otherwise

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -341,7 +333,7 @@ Reimplemented from  )  - [inline] + [inline, virtual] @@ -350,7 +342,7 @@ Reimplemented from slsDetector. +Implements slsDetector.

    @@ -362,7 +354,7 @@ Reimplemented from  )  - [inline] + [inline, virtual] @@ -371,7 +363,7 @@ Reimplemented from slsDetector. +Implements slsDetector.

    @@ -383,7 +375,7 @@ Reimplemented from  )  - [inline] + [inline, virtual] @@ -392,7 +384,7 @@ Reimplemented from slsDetector. +Implements slsDetector.

    @@ -405,7 +397,7 @@ Reimplemented from float *  pos = NULL  )  - [inline] + [inline, virtual] @@ -420,7 +412,28 @@ get positions for the acquisition

    Parameters:
    Returns:
    number of positions

    -Reimplemented from slsDetector. +Implements slsDetector. + +

    + +

    +
    + + + + + + + + +
    void* mythenDetector::processData (  )  [virtual]
    +
    +
    + +

    +function for processing data +

    +Implements slsDetector.

    @@ -433,7 +446,7 @@ Reimplemented from string  fname = ""  )  - + [virtual] @@ -448,7 +461,7 @@ reads an angular conversion file

    Parameters:
    See also:
    angleConversionConstant

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -476,14 +489,14 @@ Reimplemented from + [virtual]

    -int readCalibrationFile(string fname, float &gain, float &offset);

    Parameters:
    +reads a calibration file
    Parameters:
    @@ -492,7 +505,29 @@ int sharedSlsDetector

    -Reimplemented from slsDetector. +Implements slsDetector. + +

    + +

    +
    +
    fname file to be read
    gain reference to the gain variable reference to the offset variable
    + + + + + + + + +
    int mythenDetector::readConfigurationFile (string const   fname  )  [virtual]
    +
    +
    + +

    +Purely virtual function Should be implemented in the specific detector class /sa mythenDetector::readConfigurationFile +

    +Implements slsDetector.

    @@ -514,7 +549,7 @@ Reimplemented from + [virtual] @@ -530,7 +565,7 @@ reads a data file

    Parameters:
    Returns:
    OK or FAIL if it could not read the file or data=NULL

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -576,7 +611,7 @@ Reimplemented from + [virtual] @@ -596,7 +631,7 @@ reads a data file

    Parameters:
    Returns:
    OK or FAIL if it could not read the file or data=NULL

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -618,7 +653,7 @@ Reimplemented from + [virtual] @@ -635,7 +670,7 @@ reads a trim file

    Parameters:
    Returns:
    the pointer to myMod or NULL if reading the file failed

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -669,7 +704,7 @@ Reimplemented from + [virtual] @@ -687,7 +722,30 @@ sets the arrays of the merged data to 0. NB The array should be created with siz

    Returns:
    OK or FAIL

    -Reimplemented from slsDetector. +Implements slsDetector. + +

    + +

    +
    + + + + + + + + + +
    int mythenDetector::retrieveDetectorSetup (string const   fname  )  [virtual]
    +
    +
    + +

    +not yet implemented

    +should retrieve from a file all the current detector parameters +

    +Implements slsDetector.

    @@ -700,7 +758,7 @@ Reimplemented from string  fname = ""  )  - + [virtual] @@ -715,7 +773,7 @@ set angular conversion

    Parameters:
    Returns:
    0 if angular conversion disabled, >0 otherwise

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -728,7 +786,7 @@ Reimplemented from float  bs  )  - [inline] + [inline, virtual] @@ -737,7 +795,7 @@ Reimplemented from slsDetector. +Implements slsDetector.

    @@ -750,7 +808,7 @@ Reimplemented from float  f  )  - [inline] + [inline, virtual] @@ -759,7 +817,7 @@ Reimplemented from slsDetector. +Implements slsDetector.

    @@ -772,7 +830,7 @@ Reimplemented from float  f  )  - [inline] + [inline, virtual] @@ -781,7 +839,7 @@ Reimplemented from slsDetector. +Implements slsDetector.

    @@ -803,7 +861,7 @@ Reimplemented from [inline] + [inline, virtual] @@ -819,7 +877,7 @@ set positions for the acquisition

    Parameters:
    Returns:
    number of positions

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -832,7 +890,7 @@ Reimplemented from string  fname = ""  )  - + [virtual] @@ -847,7 +905,7 @@ writes an angular conversion file

    Parameters:
    See also:
    angleConversionConstant

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -875,7 +933,7 @@ Reimplemented from + [virtual] @@ -892,7 +950,30 @@ writes a clibration file

    Parameters:
    See also:
    sharedSlsDetector

    -Reimplemented from slsDetector. +Implements slsDetector. + +

    + +

    +
    + + + + + + + + + +
    int mythenDetector::writeConfigurationFile (string const   fname  )  [virtual]
    +
    +
    + +

    +Every detector should have a basic configuration file containing: type (mythen, pilatus etc.) hostname portnumber communication type (default TCP/IP) eventually secondary portnumber (e.g. mythen stop function) number of modules installed if different from the detector size (x,y)

    +to be changed +

    +Implements slsDetector.

    @@ -914,7 +995,7 @@ Reimplemented from + [virtual] @@ -930,7 +1011,7 @@ writes a data file

    Parameters:
    Returns:
    OK or FAIL if it could not write the file or data=NULL

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -976,7 +1057,7 @@ Reimplemented from + [virtual] @@ -996,7 +1077,7 @@ writes a data file

    Parameters:
    Returns:
    OK or FAIL if it could not write the file or data=NULL

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -1018,7 +1099,7 @@ Reimplemented from + [virtual] @@ -1035,7 +1116,7 @@ writes a trim file for module number imod - the values will be read from the cur

    See also:
    sls_detector_module sharedSlsDetector

    -Reimplemented from slsDetector. +Implements slsDetector.

    @@ -1057,7 +1138,7 @@ Reimplemented from + [virtual] @@ -1074,12 +1155,12 @@ writes a trim file

    Parameters:
    See also:
    sls_detector_module

    -Reimplemented from slsDetector. +Implements slsDetector.

    The documentation for this class was generated from the following file: -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/classslsDetector-members.html b/slsDetectorSoftware/docs/html/classslsDetector-members.html index b8a41a503..35f0c930b 100644 --- a/slsDetectorSoftware/docs/html/classslsDetector-members.html +++ b/slsDetectorSoftware/docs/html/classslsDetector-members.html @@ -20,118 +20,117 @@
  • Class Members

    • slsDetector Member List

    This is the complete list of members for slsDetector, including all inherited members.

    - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - + + - + - - - + + + - + - + + + - + - - - + + - + - + - + - - + + - - + - + - - - - - - - + + + + + + + - + - + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - + - @@ -141,44 +140,44 @@ - + - + - + - + - + - + - - - - - - - + + + + + + + - - + + -
    acquire()slsDetector
    adcsslsDetector [private]
    addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv, float *me, int *mm)slsDetector
    acquire()=0slsDetector [pure virtual]
    adcsslsDetector [protected]
    addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv, float *me, int *mm)=0slsDetector [pure virtual]
    analogTest(analogTestMode mode)slsDetector
    badChannelMaskslsDetector [private]
    chanregsslsDetector [private]
    chipregsslsDetector [private]
    controlSocketslsDetector [private]
    badChannelMaskslsDetector [protected]
    chanregsslsDetector [protected]
    chipregsslsDetector [protected]
    controlSocketslsDetector [protected]
    createFileName()slsDetector
    createModule()slsDetector
    currentI0slsDetector [private]
    currentPositionslsDetector [private]
    currentPositionIndexslsDetector [private]
    dacsslsDetector [private]
    dataProcessingThreadslsDetector [private]
    dataQueueslsDetector [private]
    dataSocketslsDetector [private]
    createModule()slsDetector
    currentI0slsDetector [protected]
    currentPositionslsDetector [protected]
    currentPositionIndexslsDetector [protected]
    dacsslsDetector [protected]
    dataProcessingThreadslsDetector [protected]
    dataQueueslsDetector [protected]
    dataSocketslsDetector [protected]
    decodeData(int *datain)slsDetector
    deleteModule(sls_detector_module *myMod)slsDetector
    detectorModulesslsDetector [private]
    detIdslsDetector [private]
    detectorModulesslsDetector [protected]
    detIdslsDetector [protected]
    digitalTest(digitalTestMode mode, int imod=0)slsDetector
    dumpDetectorSetup(string const fname)slsDetector
    dumpDetectorSetup(string const fname)=0slsDetector [pure virtual]
    enableAnalogOutput(int ichan)slsDetector
    enableAnalogOutput(int imod, int ichip, int ichan)slsDetector
    execCommand(string cmd, string answer)slsDetector
    executeTrimming(trimMode mode, int par1, int par2, int imod=-1)slsDetector
    exists()slsDetector [inline]
    exitServer()slsDetector
    ffcoefficientsslsDetector [private]
    fferrorsslsDetector [private]
    fillBadChannelMask()slsDetector [private]
    ffcoefficientsslsDetector [protected]
    fferrorsslsDetector [protected]
    fillBadChannelMask()slsDetector [protected]
    finalizeMerging(float *mp, float *mv, float *me, int *mm)slsDetector
    flatFieldCorrect(float datain, float errin, float &dataout, float &errout, float ffcoefficient, float fferr)slsDetector
    flatFieldCorrect(float *datain, float *errin, float *dataout, float *errout)slsDetector
    freeSharedMemory()slsDetector [private]
    freeSharedMemory()slsDetector [protected]
    GET_ONLINE_FLAG enum valueslsDetector
    getADC(dacIndex index, int imod=0)slsDetector
    getAngularConversion(int &direction, angleConversionConstant *angconv=NULL)slsDetector
    getAngularConversion(int &direction, angleConversionConstant *angconv=NULL)=0slsDetector [pure virtual]
    getAngularConversion()=0slsDetector [pure virtual]
    getBadChannelCorrectionFile()slsDetector [inline]
    getBadChannelCorrections(int *bad=NULL)slsDetector
    getBinSize()slsDetector [inline]
    getBinSize()=0slsDetector [pure virtual]
    getCalDir()slsDetector [inline]
    getChannel(int ichan, int ichip, int imod)slsDetector
    getChip(int ichip, int imod)slsDetector
    getClockDivider()slsDetector [inline]
    getChannel(int ichan, int ichip, int imod)slsDetector
    getChip(int ichip, int imod)slsDetector
    getControlPort()slsDetector [inline]
    getDataFromDetector()slsDetector [private]
    getDataFromDetector()slsDetector [protected]
    getDataFromDetectorNoWait()slsDetector
    getDataPort()slsDetector [inline]
    getDetectorType(char *type)slsDetector
    getFileIndex()slsDetector [inline]
    getFileName()slsDetector [inline]
    getFilePath()slsDetector [inline]
    getFineOffset()slsDetector [inline]
    getFineOffset()=0slsDetector [pure virtual]
    getFlatFieldCorrections(float *corr=NULL, float *ecorr=NULL)slsDetector
    getGlobalOffset()slsDetector [inline]
    getGlobalOffset()=0slsDetector [pure virtual]
    getHostname()slsDetector [inline]
    getId(idMode mode, int imod=0)slsDetector
    getMaxNumberOfModules(dimension d=X)slsDetector
    getModule(int imod)slsDetector
    getPositions(float *pos=NULL)slsDetector [inline]
    getModule(int imod)slsDetector
    getPositions(float *pos=NULL)=0slsDetector [pure virtual]
    getRateCorrections(float &t)slsDetector
    getRateCorrections()slsDetector
    getRunStatus()slsDetector
    getSetLength()slsDetector [inline]
    getSettings(int imod=-1)slsDetector
    getSettings(int imod=-1)slsDetector
    getStopPort()slsDetector [inline]
    getThresholdEnergy(int imod=-1)slsDetector
    getTimeLeft(timerIndex index)slsDetector
    getTrimDir()slsDetector [inline]
    getTrimEn(int *en)slsDetector [inline]
    getTrimEn(int *en=NULL)slsDetector [inline]
    giveCalibrationPulse(float vcal, int npulses)slsDetector
    initializeDetectorSize(detectorType type)slsDetector [private]
    initializeDetectorStructure()slsDetector [private]
    initSharedMemory(detectorType type=GENERIC, int id=0)slsDetector [private]
    mergingBinsslsDetector [private]
    mergingCountsslsDetector [private]
    mergingErrorsslsDetector [private]
    mergingMultiplicityslsDetector [private]
    initializeDetectorSize(detectorType type)slsDetector [protected]
    initializeDetectorStructure()slsDetector [protected]
    initSharedMemory(detectorType type=GENERIC, int id=0)slsDetector [protected]
    mergingBinsslsDetector [protected]
    mergingCountsslsDetector [protected]
    mergingErrorsslsDetector [protected]
    mergingMultiplicityslsDetector [protected]
    OFFLINE_FLAG enum valueslsDetector
    ONLINE_FLAG enum valueslsDetector
    onlineFlagslsDetector [private]
    onlineFlagslsDetector [protected]
    popDataQueue()slsDetector
    processData()slsDetector
    processData()=0slsDetector [pure virtual]
    rateCorrect(float datain, float errin, float &dataout, float &errout, float tau, float t)slsDetector
    rateCorrect(float *datain, float *errin, float *dataout, float *errout)slsDetector
    readAll()slsDetector
    readAngularConversion(string fname="")slsDetector
    readCalibrationFile(string fname, float &gain, float &offset)slsDetector
    readConfigurationFile(string const fname)slsDetector
    readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0)slsDetector
    readDataFile(string fname, int *data)slsDetector
    readAngularConversion(string fname="")=0slsDetector [pure virtual]
    readCalibrationFile(string fname, float &gain, float &offset)=0slsDetector [pure virtual]
    readConfigurationFile(string const fname)=0slsDetector [pure virtual]
    readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0)=0slsDetector [pure virtual]
    readDataFile(string fname, int *data)=0slsDetector [pure virtual]
    readFrame()slsDetector
    readRegister(int addr)slsDetector
    readTrimFile(string fname, sls_detector_module *myMod=NULL)slsDetector
    receiveChannel(sls_detector_channel *)slsDetector [private]
    receiveChip(sls_detector_chip *)slsDetector [private]
    receiveModule(sls_detector_module *)slsDetector [private]
    resetMerging(float *mp, float *mv, float *me, int *mm)slsDetector
    retrieveDetectorSetup(string const fname)slsDetector
    sendChannel(sls_detector_channel *)slsDetector [private]
    sendChip(sls_detector_chip *)slsDetector [private]
    sendModule(sls_detector_module *)slsDetector [private]
    setAngularConversion(string fname="")slsDetector
    readTrimFile(string fname, sls_detector_module *myMod=NULL)=0slsDetector [pure virtual]
    receiveChannel(sls_detector_channel *)slsDetector [protected]
    receiveChip(sls_detector_chip *)slsDetector [protected]
    receiveModule(sls_detector_module *)slsDetector [protected]
    resetMerging(float *mp, float *mv, float *me, int *mm)=0slsDetector [pure virtual]
    retrieveDetectorSetup(string const fname)=0slsDetector [pure virtual]
    sendChannel(sls_detector_channel *)slsDetector [protected]
    sendChip(sls_detector_chip *)slsDetector [protected]
    sendModule(sls_detector_module *)slsDetector [protected]
    setAngularConversion(string fname="")=0slsDetector [pure virtual]
    setBadChannelCorrection(string fname="")slsDetector
    setBinSize(float bs)slsDetector [inline]
    setBinSize(float bs)=0slsDetector [pure virtual]
    setCalDir(string s)slsDetector [inline]
    setChannel(int64_t reg, int ichan=-1, int ichip=-1, int imod=-1)slsDetector
    setChannel(sls_detector_channel chan)slsDetector
    setChip(int reg, int ichip=-1, int imod=-1)slsDetector
    setChip(sls_detector_chip chip)slsDetector
    setClockDivider(int i)slsDetector [inline]
    setDAC(float val, dacIndex index, int imod=-1)slsDetector
    setDetectorType(detectorType type=GET_DETECTOR_TYPE)slsDetector
    setDetectorType(string type)slsDetector
    setFileIndex(int i)slsDetector [inline]
    setFileName(string s)slsDetector [inline]
    setFilePath(string s)slsDetector [inline]
    setFineOffset(float f)slsDetector [inline]
    setFineOffset(float f)=0slsDetector [pure virtual]
    setFlatFieldCorrection(string fname="")slsDetector
    setGlobalOffset(float f)slsDetector [inline]
    setGlobalOffset(float f)=0slsDetector [pure virtual]
    setModule(int reg, int imod=-1)slsDetector
    setModule(sls_detector_module module)slsDetector
    setNumberOfModules(int n, dimension d=X)slsDetector
    setOnline(int const online)slsDetector
    setPositions(int nPos, float *pos)slsDetector [inline]
    setPositions(int nPos, float *pos)=0slsDetector [pure virtual]
    setRateCorrection(float t=0)slsDetector
    setReadOutFlags(readOutFlags flag)slsDetector
    setROI(int nroi=-1, int *xmin=NULL, int *xmax=NULL, int *ymin=NULL, int *ymax=NULL)slsDetector
    setSetLength(int i)slsDetector [inline]
    setSettings(detectorSettings isettings, int imod=-1)slsDetector
    setSpeed(speedVariable sp, int value=-1)slsDetector
    setTCPSocket(string const name="", int const control_port=-1, int const stop_port=-1, int const data_port=-1)slsDetector
    setThresholdEnergy(int e_eV, int imod=-1, detectorSettings isettings=GET_SETTINGS)slsDetector
    setTimer(timerIndex index, int64_t t=-1)slsDetector
    setTrimDir(string s)slsDetector [inline]
    sharedSlsDetector typedefslsDetector
    shmIdslsDetector [private]
    shmIdslsDetector [protected]
    slsDetector(detectorType type=GENERIC, int id=0)slsDetector
    startAcquisition()slsDetector
    startAndReadAll()slsDetector
    startAndReadAllNoWait()slsDetector
    startReadOut()slsDetector
    startThread()slsDetector [private]
    startThread()slsDetector [protected]
    stopAcquisition()slsDetector
    stopSocketslsDetector [private]
    thisDetectorslsDetector [private]
    writeAngularConversion(string fname="")slsDetector
    writeCalibrationFile(string fname, float gain, float offset)slsDetector
    writeConfigurationFile(string const fname)slsDetector
    writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1)slsDetector
    writeDataFile(string fname, int *data)slsDetector
    stopSocketslsDetector [protected]
    thisDetectorslsDetector [protected]
    writeAngularConversion(string fname="")=0slsDetector [pure virtual]
    writeCalibrationFile(string fname, float gain, float offset)=0slsDetector [pure virtual]
    writeConfigurationFile(string const fname)=0slsDetector [pure virtual]
    writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1)=0slsDetector [pure virtual]
    writeDataFile(string fname, int *data)=0slsDetector [pure virtual]
    writeRegister(int addr, int val)slsDetector
    writeTrimFile(string fname, sls_detector_module mod)slsDetector
    writeTrimFile(string fname, int imod)slsDetector
    writeTrimFile(string fname, sls_detector_module mod)=0slsDetector [pure virtual]
    writeTrimFile(string fname, int imod)=0slsDetector [pure virtual]
    ~slsDetector()slsDetector [inline]

    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/classslsDetector.html b/slsDetectorSoftware/docs/html/classslsDetector.html index 3779fdbb8..6a0bb8d4e 100644 --- a/slsDetectorSoftware/docs/html/classslsDetector.html +++ b/slsDetectorSoftware/docs/html/classslsDetector.html @@ -56,13 +56,13 @@ int exists () -int readConfigurationFile (string const fname) +virtual int readConfigurationFile (string const fname)=0 -int writeConfigurationFile (string const fname) +virtual int writeConfigurationFile (string const fname)=0 -int dumpDetectorSetup (string const fname) +virtual int dumpDetectorSetup (string const fname)=0 -int retrieveDetectorSetup (string const fname) +virtual int retrieveDetectorSetup (string const fname)=0 int setTCPSocket (string const name="", int const control_port=-1, int const stop_port=-1, int const data_port=-1) @@ -78,13 +78,13 @@ char * setTrimDir (string s) -int getTrimEn (int *en) +int getTrimEn (int *en=NULL) -sls_detector_module * readTrimFile (string fname, sls_detector_module *myMod=NULL) +virtual sls_detector_module * readTrimFile (string fname, sls_detector_module *myMod=NULL)=0 -int writeTrimFile (string fname, sls_detector_module mod) +virtual int writeTrimFile (string fname, sls_detector_module mod)=0 -int writeTrimFile (string fname, int imod) +virtual int writeTrimFile (string fname, int imod)=0 char * setFilePath (string s) @@ -100,25 +100,25 @@ string createFileName () -int writeDataFile (string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1) +virtual int writeDataFile (string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1)=0 -int writeDataFile (string fname, int *data) +virtual int writeDataFile (string fname, int *data)=0 -int readDataFile (string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0) +virtual int readDataFile (string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0)=0 -int readDataFile (string fname, int *data) +virtual int readDataFile (string fname, int *data)=0 char * getCalDir () char * setCalDir (string s) -int readCalibrationFile (string fname, float &gain, float &offset) +virtual int readCalibrationFile (string fname, float &gain, float &offset)=0 -int writeCalibrationFile (string fname, float gain, float offset) +virtual int writeCalibrationFile (string fname, float gain, float offset)=0 -int readAngularConversion (string fname="") +virtual int readAngularConversion (string fname="")=0 -int writeAngularConversion (string fname="") +virtual int writeAngularConversion (string fname="")=0 int execCommand (string cmd, string answer) @@ -160,25 +160,25 @@ int setChannel (sls_detector_channel chan) -sls_detector_channel getChannel (int ichan, int ichip, int imod) +sls_detector_channel getChannel (int ichan, int ichip, int imod) int setChip (int reg, int ichip=-1, int imod=-1) int setChip (sls_detector_chip chip) -sls_detector_chip getChip (int ichip, int imod) +sls_detector_chip getChip (int ichip, int imod) int setModule (int reg, int imod=-1) int setModule (sls_detector_module module) -sls_detector_module * getModule (int imod) +sls_detector_module * getModule (int imod) int getThresholdEnergy (int imod=-1) int setThresholdEnergy (int e_eV, int imod=-1, detectorSettings isettings=GET_SETTINGS) -detectorSettings getSettings (int imod=-1) +detectorSettings getSettings (int imod=-1) detectorSettings setSettings (detectorSettings isettings, int imod=-1) @@ -206,13 +206,7 @@ int64_t getTimeLeft (timerIndex index) -int setClockDivider (int i) - -int getClockDivider () - -int setSetLength (int i) - -int getSetLength () +int setSpeed (speedVariable sp, int value=-1) int setDynamicRange (int n=-1) @@ -236,25 +230,29 @@ int getBadChannelCorrections (int *bad=NULL) -int setAngularConversion (string fname="") +char * getBadChannelCorrectionFile () -int getAngularConversion (int &direction, angleConversionConstant *angconv=NULL) +virtual int setAngularConversion (string fname="")=0 -float setGlobalOffset (float f) +virtual int getAngularConversion (int &direction, angleConversionConstant *angconv=NULL)=0 -float setFineOffset (float f) +virtual char * getAngularConversion ()=0 -float getFineOffset () +virtual float setGlobalOffset (float f)=0 -float getGlobalOffset () +virtual float setFineOffset (float f)=0 -int setPositions (int nPos, float *pos) +virtual float getFineOffset ()=0 -int getPositions (float *pos=NULL) +virtual float getGlobalOffset ()=0 -float setBinSize (float bs) +virtual int setPositions (int nPos, float *pos)=0 -float getBinSize () +virtual int getPositions (float *pos=NULL)=0 + +virtual float setBinSize (float bs)=0 + +virtual float getBinSize ()=0 float * decodeData (int *datain) @@ -266,23 +264,23 @@ int rateCorrect (float *datain, float *errin, float *dataout, float *errout) -int resetMerging (float *mp, float *mv, float *me, int *mm) +virtual int resetMerging (float *mp, float *mv, float *me, int *mm)=0 -int addToMerging (float *p1, float *v1, float *e1, float *mp, float *mv, float *me, int *mm) +virtual int addToMerging (float *p1, float *v1, float *e1, float *mp, float *mv, float *me, int *mm)=0 int finalizeMerging (float *mp, float *mv, float *me, int *mm) int exitServer () -void * processData () +virtual void * processData ()=0 -sls_detector_module * createModule () +sls_detector_module * createModule () void deleteModule (sls_detector_module *myMod) -void acquire () +virtual void acquire ()=0 -

    Private Member Functions

    +

    Protected Member Functions

    int * getDataFromDetector () int initSharedMemory (detectorType type=GENERIC, int id=0) @@ -309,7 +307,7 @@ int fillBadChannelMask () -

    Private Attributes

    +

    Protected Attributes

    sharedSlsDetector * thisDetector int onlineFlag @@ -368,7 +366,7 @@ This is the base class for all SLS detector functionalities.

    The slsDetector class is expected to become the interface class for all SLS Detectors acquisition (and analysis) software.

    Author:
    Anna Bergamaschi
    -
    Version:
    0.1alpha (any string)
    +
    Version:
    0.1alpha

    Member Typedef Documentation

    @@ -478,31 +476,38 @@ destructor

    Member Function Documentation

    - +
    - + - +
    void slsDetector::acquire virtual void slsDetector::acquire (  )  [pure virtual]

    +pure virtual function performs the complete acquisition and data processing moves the detector to next position
    + starts and reads the detector
    + reads the IC (if required)
    + reads the encoder (iof required for angualr conversion)
    + processes the data (flat field, rate, angular conversion and merging processData())

    See also:
    mythenDetector::acquire()
    +

    +Implemented in mythenDetector.

    - +

    - + @@ -546,14 +551,14 @@ destructor - +
    int slsDetector::addToMerging virtual int slsDetector::addToMerging ( float *  p1,
    ) [pure virtual]

    -not yet implemented merge dataset

    Parameters:
    +pure virtual function merge dataset
    Parameters:
    @@ -564,9 +569,10 @@ not yet implemented merge dataset
    Parameters:
    p1 angular positions of dataset
    v1 data
    mm multiplicity of merged arrays
    +
    See also:
    mythenDetector::addToMerging

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    @@ -617,12 +623,12 @@ in case also appends the position index

    Filenames will be of the form: filepath/filename(_px)_i where x is the position index and i is the run index

    - +

    - + @@ -662,7 +668,7 @@ decode data from the detector converting them to an array of floats, one for eac
    Returns:
    pointer to a float array with a data per channel

    -Reimplemented in mythenDetector, and eigerDetector. +Reimplemented in eigerDetector.

    @@ -726,25 +732,26 @@ Digital test of the modules

    Parameters:

    - +

    slsDetector::sls_detector_module * slsDetector::createModule sls_detector_module * slsDetector::createModule (  ) 
    - + - +
    int slsDetector::dumpDetectorSetup virtual int slsDetector::dumpDetectorSetup ( string const   fname  )  [pure virtual]

    -not yet implemented

    -should dump to a file all the current detector parameters +Purely virtual function Should be implemented in the specific detector class /sa mythenDetector::dumpDetectorSetup +

    +Implemented in mythenDetector.

    @@ -926,7 +933,7 @@ sets the onlineFlag

    Returns:
    1 if the detector st

    -turns of server +turns off server

    @@ -938,7 +945,7 @@ turns of server (  )  - [private] + [protected] @@ -986,7 +993,7 @@ fill bad channel mask (0 if channel is good, 1 if bad)

    -calculates the "final" positions, data value and errors for the emrged data

    Parameters:
    +pure virtual function calculates the "final" positions, data value and errors for the emrged data
    Parameters:
    @@ -994,7 +1001,8 @@ calculates the "final" positions, data value and errors for the emrged data
    mp already merged postions
    mv already merged data
    mm multiplicity of merged arrays
    -
    Returns:
    FAIL or the
    +
    Returns:
    FAIL or the number of non empty bins (i.e. points belonging to the pattern)
    +
    See also:
    mythenDetector::finalizeMerging

    Reimplemented in mythenDetector. @@ -1123,7 +1131,7 @@ flat field correct data

    Parameters:
    (  )  - [private] + [protected]
    @@ -1169,12 +1177,34 @@ set dacs value
    Parameters:

    - +

    - + + + + + + +
    int slsDetector::getAngularConversion virtual char* slsDetector::getAngularConversion (  )  [pure virtual]
    +
    +
    + +

    +pure virtual function returns the angular conversion file

    See also:
    mythenDetector::getAngularConversion
    + +

    +Implemented in mythenDetector. +

    +

    + +

    +
    + + + @@ -1188,23 +1218,43 @@ set dacs value
    Parameters:
    - +
    virtual int slsDetector::getAngularConversion ( int &  direction,
    ) [pure virtual]

    -get angular conversion

    Parameters:
    +pure virtual function get angular conversion
    Parameters:
    reference to diffractometer direction
    angconv array that will be filled with the angular conversion constants
    Returns:
    0 if angular conversion disabled, >0 otherwise
    +
    See also:
    mythenDetector::getAngularConversion

    -Reimplemented in mythenDetector. +Implemented in mythenDetector. +

    +

    + +

    +
    + + + + + + + + +
    char* slsDetector::getBadChannelCorrectionFile (  )  [inline]
    +
    +
    + +

    +returns the bad channel list file

    @@ -1233,25 +1283,26 @@ get bad channels correction

    Parameters:

    - +

    - + - +
    float slsDetector::getBinSize virtual float slsDetector::getBinSize (  )  [inline] [pure virtual]

    -return detector bin size used for merging (approx angular resolution) +pure virtual function return detector bin size used for merging (approx angular resolution)

    See also:
    mythenDetector::getBinSize
    +

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    @@ -1274,12 +1325,12 @@ returns the location of the calibration files

    See also:

    - +

    - + @@ -1317,12 +1368,12 @@ get channel
    Parameters:

    - +

    slsDetector::sls_detector_channel slsDetector::getChannel sls_detector_channel slsDetector::getChannel ( int  ichan,
    - + @@ -1352,26 +1403,6 @@ get chip
    Parameters:
    Returns:
    current chip structure for channel
    Bug:
    probably does not return corretly!
    - -

    - -

    -
    -
    slsDetector::sls_detector_chip slsDetector::getChip sls_detector_chip slsDetector::getChip ( int  ichip,
    - - - - - - - -
    int slsDetector::getClockDivider (  )  [inline]
    -
    -
    - -

    -get clock divider

    -not implemented (should be something more general like "set speed including also waitstates, set cycles etc.)

    @@ -1403,7 +1434,7 @@ returns the detector control port

    See also:
    (  )  - [private] + [protected] @@ -1540,25 +1571,26 @@ returns the default output files path
    See also:
    <

    - +

    - + - +
    float slsDetector::getFineOffset virtual float slsDetector::getFineOffset (  )  [inline] [pure virtual]

    -get detector fine offset +pure virtual function get detector fine offset

    See also:
    mythenDetector::getFineOffset
    +

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    @@ -1597,25 +1629,26 @@ get flat field corrections

    Parameters:

    - +

    - + - +
    float slsDetector::getGlobalOffset virtual float slsDetector::getGlobalOffset (  )  [inline] [pure virtual]

    -get detector global offset +pure virtual function get detector global offset

    See also:
    mythenDetector::getGlobalOffset
    +

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    @@ -1700,12 +1733,12 @@ get the maximum size of the detector

    Parameters:

    - +

    - + @@ -1726,32 +1759,33 @@ get module
    Parameters:

    - +

    slsDetector::sls_detector_module * slsDetector::getModule sls_detector_module * slsDetector::getModule ( int  imod
    - + - +
    int slsDetector::getPositions virtual int slsDetector::getPositions ( float *  pos = NULL  )  [inline] [pure virtual]

    -get positions for the acquisition

    Parameters:
    +pure virtual function get positions for the acquisition
    Parameters:
    pos array which will contain the encoder positions
    Returns:
    number of positions
    +
    See also:
    mythenDetector::getPositions

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    @@ -1820,32 +1854,12 @@ get run status

    Returns:
    status mask

    - +

    - - - - - - -
    int slsDetector::getSetLength (  )  [inline]
    -
    -
    - -

    -get length cycles

    -not implemented (should be something more general like "set speed including also waitstates, set cycles etc.) -

    -

    - -

    -
    - - - + @@ -1958,7 +1972,7 @@ returns the detector trimbit directory
    See also:
    <

    - +

    slsDetector::detectorSettings slsDetector::getSettings detectorSettings slsDetector::getSettings ( int  imod = -1
    @@ -1966,7 +1980,7 @@ returns the detector trimbit directory
    See also:
    <
    - + @@ -2031,7 +2045,7 @@ not yet implemented - +
    int slsDetector::getTrimEn ( int *  en en = NULL  )  [inline]
    detectorType  type  )  [private] [protected]
    @@ -2058,6 +2072,7 @@ set fileIndex to default to 0

    set number of trim energies to 0

    set correction mask to 0

    set deat time

    +sets bad channel list file to none

    set number of bad chans to 0

    set number of bad flat field chans to 0

    set angular direction to 1

    @@ -2069,6 +2084,7 @@ set current settings to uninitialized

    set threshold to -1

    set clockdivider to 1

    set number of positions to 0

    +sets angular conversion file to none

    set binsize

    calculates the memory offsets for flat field coefficients and errors, module structures, dacs, adcs, chips and channels

    also in case thisDetector alread existed initialize the pointer for flat field coefficients and errors, module structures, dacs, adcs, chips and channels

    @@ -2087,7 +2103,7 @@ fill the BadChannelMask

    See also:
    (  )  - [private] + [protected]
    @@ -2125,7 +2141,7 @@ initialize gain and offset to -1 ) - [private] + [protected] @@ -2168,32 +2184,26 @@ pops the data from the data queue
    Returns:
    pointe

    - +

    - + - +
    void * slsDetector::processData virtual void* slsDetector::processData (  )  [pure virtual]

    -function for processing data +pure virtual function function for processing data

    See also:
    mythenDetector::processData
    +

    -Pop data queue

    -decode data

    -write raw data file

    -rate correction

    -flat field correction

    -angular conversion

    -data merging

    -file writing +Implemented in mythenDetector.

    @@ -2331,40 +2341,40 @@ asks and receives all data from the detector and puts them in a data queue

    - +

    - + - +
    int slsDetector::readAngularConversion virtual int slsDetector::readAngularConversion ( string  fname = ""  )  [pure virtual]

    -reads an angular conversion file

    Parameters:
    +Pure virtual function reads an angular conversion file
    Parameters:
    fname file to be read
    -
    See also:
    angleConversionConstant
    +
    See also:
    angleConversionConstant mythenDetector::readAngularConversion

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    - +

    - + @@ -2384,52 +2394,53 @@ Reimplemented in +
    int slsDetector::readCalibrationFile virtual int slsDetector::readCalibrationFile ( string  fname, [pure virtual]

    -reads a calibration file

    Parameters:
    +Pure virtual function reads a calibration file
    Parameters:
    fname file to be read
    gain reference to the gain variable reference to the offset variable
    -
    See also:
    sharedSlsDetector
    +
    See also:
    sharedSlsDetector mythenDetector::readCalibrationFile

    -Reimplemented in mythenDetector, and eigerDetector. +Implemented in mythenDetector, and eigerDetector.

    - +

    - + - +
    int slsDetector::readConfigurationFile virtual int slsDetector::readConfigurationFile ( string const   fname  )  [pure virtual]

    -Every detector should have a basic configuration file containing: type (mythen, pilatus etc.) hostname portnumber communication type (default TCP/IP) eventually secondary portnumber (e.g. mythen stop function) number of modules installed if different from the detector size (x,y)

    -to be changed +Purely virtual function Should be implemented in the specific detector class /sa mythenDetector::readConfigurationFile +

    +Implemented in mythenDetector.

    - +

    - + @@ -2443,31 +2454,32 @@ to be changed - +
    int slsDetector::readDataFile virtual int slsDetector::readDataFile ( string  fname,
    ) [pure virtual]

    -reads a data file

    Parameters:
    +Pure virtual function reads a data file
    Parameters:
    name of the file to be read
    data array of data values
    Returns:
    OK or FAIL if it could not read the file or data=NULL
    +
    See also:
    mythenDetector::readDataFile

    -Reimplemented in mythenDetector, and eigerDetector. +Implemented in mythenDetector, and eigerDetector.

    - +

    - + @@ -2505,14 +2517,14 @@ Reimplemented in +
    int slsDetector::readDataFile virtual int slsDetector::readDataFile ( string  fname, [pure virtual]

    -reads a data file

    Parameters:
    +Pure virtual function reads a data file
    Parameters:
    @@ -2522,10 +2534,11 @@ reads a data file
    Parameters:
    name of the file to be read
    data array of data values to be filled
    nch number of channels to be written to file. if <=0 defaults to the number of installed channels of the detector
    -
    Returns:
    OK or FAIL if it could not read the file or data=NULL
    +
    Returns:
    OK or FAIL if it could not read the file or data=NULL
    +
    See also:
    mythenDetector::readDataFile

    -Reimplemented in mythenDetector, and eigerDetector. +Implemented in mythenDetector, and eigerDetector.

    @@ -2575,12 +2588,12 @@ read register

    Parameters:

    - +

    - + @@ -2594,14 +2607,14 @@ read register
    Parameters:
    - +
    sls_detector_module* slsDetector::readTrimFile virtual sls_detector_module* slsDetector::readTrimFile ( string  fname,
    ) [pure virtual]

    -reads a trim file

    Parameters:
    +Pure virtual function reads a trim file
    Parameters:
    fname name of the file to be read
    myMod pointer to the module structure which has to be set.
    @@ -2609,9 +2622,10 @@ reads a trim file
    Parameters:
    Returns:
    the pointer to myMod or NULL if reading the file failed
    +
    See also:
    mythenDetector::readTrimFile

    -Reimplemented in mythenDetector, and eigerDetector. +Implemented in mythenDetector, and eigerDetector.

    @@ -2624,7 +2638,7 @@ Reimplemented in sls_detector_channel *   )  - [private] + [protected] @@ -2644,7 +2658,7 @@ receive a sls_detector_ch sls_detector_chip *   )  - [private] + [protected] @@ -2664,7 +2678,7 @@ receive a sls_detector_chip< sls_detector_module *   )  - [private] + [protected] @@ -2674,12 +2688,12 @@ receive a sls_detector_chip< receive a sls_detector_module structure over socket

    - +

    - + @@ -2705,14 +2719,14 @@ receive a sls_detector_mod - +
    int slsDetector::resetMerging virtual int slsDetector::resetMerging ( float *  mp,
    ) [pure virtual]

    -sets the arrays of the merged data to 0. NB The array should be created with size >= 360./getBinSize();

    Parameters:
    +pure virtual function sets the arrays of the merged data to 0. NB The array should be created with size >= 360./getBinSize();
    Parameters:
    @@ -2721,30 +2735,32 @@ sets the arrays of the merged data to 0. NB The array should be created with siz
    mp already merged postions
    mv already merged data
    Returns:
    OK or FAIL
    +
    See also:
    mythenDetector::resetMerging

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    - +

    - + - +
    int slsDetector::retrieveDetectorSetup virtual int slsDetector::retrieveDetectorSetup ( string const   fname  )  [pure virtual]

    -not yet implemented

    -should retrieve from a file all the current detector parameters +Purely virtual function Should be implemented in the specific detector class /sa mythenDetector::retrieveDetectorSetup +

    +Implemented in mythenDetector.

    @@ -2757,7 +2773,7 @@ should retrieve from a file all the current detector parameters sls_detector_channel *   )  - [private] + [protected] @@ -2777,7 +2793,7 @@ send a sls_detector_chann sls_detector_chip *   )  - [private] + [protected] @@ -2797,7 +2813,7 @@ send a sls_detector_chip sls_detector_module *   )  - [private] + [protected] @@ -2807,32 +2823,33 @@ send a sls_detector_chip send a sls_detector_module structure over socket

    - +

    - + - +
    int slsDetector::setAngularConversion virtual int slsDetector::setAngularConversion ( string  fname = ""  )  [pure virtual]

    -set angular conversion

    Parameters:
    +pure virtual function set angular conversion
    Parameters:
    fname file with angular conversion constants ("" disable)
    Returns:
    0 if angular conversion disabled, >0 otherwise
    +
    See also:
    mythenDetector::setAngularConversion

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    @@ -2861,26 +2878,33 @@ set bad channels correction

    Parameters:

    - +

    - + - +
    float slsDetector::setBinSize virtual float slsDetector::setBinSize ( float  bs  )  [inline] [pure virtual]

    -set detector bin size used for merging (approx angular resolution) +pure virtual function set detector bin size used for merging (approx angular resolution)

    Parameters:
    + + +
    bs bin size in degrees
    +
    +
    Returns:
    current bin size
    +
    See also:
    mythenDetector::setBinSize
    +

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    @@ -3050,27 +3074,6 @@ configure chip

    Parameters:
    Returns:
    current register value
    See also:
    sls_detector_chip
    - -

    - -

    -
    - - - - - - - - - -
    int slsDetector::setClockDivider (int  i  )  [inline]
    -
    -
    - -

    -set clock divider

    -not implemented (should be something more general like "set speed including also waitstates, set cycles etc.)

    @@ -3328,26 +3331,27 @@ sets the default output files path

    See also:

    - +

    - + - +
    float slsDetector::setFineOffset virtual float slsDetector::setFineOffset ( float  f  )  [inline] [pure virtual]

    -set detector fine offset +pure virtual function set detector fine offset

    See also:
    mythenDetector::setFineOffset
    +

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    @@ -3376,26 +3380,27 @@ set flat field corrections

    Parameters:

    - +

    - + - +
    float slsDetector::setGlobalOffset virtual float slsDetector::setGlobalOffset ( float  f  )  [inline] [pure virtual]

    -set detector global offset +pure virtual function set detector global offset

    See also:
    mythenDetector::setGlobalOffset
    +

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    @@ -3525,12 +3530,12 @@ sets the onlineFlag

    Parameters:

    - +

    - + @@ -3544,23 +3549,24 @@ sets the onlineFlag
    Parameters:
    - +
    int slsDetector::setPositions virtual int slsDetector::setPositions ( int  nPos,
    ) [inline] [pure virtual]

    -set positions for the acquisition

    Parameters:
    +pure virtual function set positions for the acquisition
    Parameters:
    nPos number of positions
    pos array with the encoder positions
    Returns:
    number of positions
    +
    See also:
    mythenDetector::setPositions

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    @@ -3663,27 +3669,6 @@ set roi

    not yet implemented

    - -

    -
    - - - - - - - - - -
    int slsDetector::setSetLength (int  i  )  [inline]
    -
    -
    - -

    -set length cycles

    -not implemented (should be something more general like "set speed including also waitstates, set cycles etc.) -

    -

    @@ -3718,6 +3703,43 @@ set detector settings
    Parameters:
    Returns:
    current settings
    in this function trimbits and calibration files are searched in the trimDir and calDir directories and the detector is initialized +
    +

    + +

    +
    + + + + + + + + + + + + + + + + + + +
    int slsDetector::setSpeed (speedVariable  sp,
    int  value = -1 
    )
    +
    +
    + +

    +sets/gets the value of important readout speed parameters

    Parameters:
    + + + +
    sp is the parameter to be set/get
    value is the value to be set, if -1 get value
    +
    +
    Returns:
    current value for the specified parameter
    +
    See also:
    speedVariable
    +

    @@ -3961,7 +3983,7 @@ start readout (without exposure or interrupting exposure)

    Ret (  )  - [private] + [protected] @@ -3991,40 +4013,40 @@ stop detector acquisition
    Returns:
    OK/FAIL
    <

    - +

    - + - +
    int slsDetector::writeAngularConversion virtual int slsDetector::writeAngularConversion ( string  fname = ""  )  [pure virtual]

    -writes an angular conversion file

    Parameters:
    +Pure virtual function writes an angular conversion file
    Parameters:
    fname file to be written
    -
    See also:
    angleConversionConstant
    +
    See also:
    angleConversionConstant mythenDetector::writeAngularConversion

    -Reimplemented in mythenDetector. +Implemented in mythenDetector.

    - +

    - + @@ -4044,53 +4066,54 @@ Reimplemented in +
    int slsDetector::writeCalibrationFile virtual int slsDetector::writeCalibrationFile ( string  fname, [pure virtual]

    -writes a clibration file

    Parameters:
    +Pure virtual function writes a calibration file
    Parameters:
    fname file to be written
    gain 
    offset 
    -
    See also:
    sharedSlsDetector
    +
    See also:
    sharedSlsDetector mythenDetector::writeCalibrationFile

    -Reimplemented in mythenDetector, and eigerDetector. +Implemented in mythenDetector, and eigerDetector.

    - +

    - + - +
    int slsDetector::writeConfigurationFile virtual int slsDetector::writeConfigurationFile ( string const   fname  )  [pure virtual]

    -Every detector should have a basic configuration file containing: type (mythen, pilatus etc.) hostname portnumber communication type (default TCP/IP) eventually secondary portnumber (e.g. mythen stop function) number of modules installed if different from the detector size (x,y)

    -to be changed +Purely virtual function Should be implemented in the specific detector class /sa mythenDetector::writeConfigurationFile +

    +Implemented in mythenDetector.

    - +

    - + @@ -4104,31 +4127,32 @@ to be changed - +
    int slsDetector::writeDataFile virtual int slsDetector::writeDataFile ( string  fname,
    ) [pure virtual]

    -writes a data file

    Parameters:
    +Pure virtual function writes a data file
    Parameters:
    name of the file to be written
    data array of data values
    Returns:
    OK or FAIL if it could not write the file or data=NULL
    +
    See also:
    mythenDetector::writeDataFile

    -Reimplemented in mythenDetector, and eigerDetector. +Implemented in mythenDetector, and eigerDetector.

    - +

    - + @@ -4166,14 +4190,14 @@ Reimplemented in +
    int slsDetector::writeDataFile virtual int slsDetector::writeDataFile ( string  fname, [pure virtual]

    -writes a data file

    Parameters:
    +Pure virtual function writes a data file
    Parameters:
    @@ -4184,9 +4208,10 @@ writes a data file
    Parameters:
    name of the file to be written
    data array of data values
    Returns:
    OK or FAIL if it could not write the file or data=NULL
    +
    See also:
    mythenDetector::writeDataFile

    -Reimplemented in mythenDetector, and eigerDetector. +Implemented in mythenDetector, and eigerDetector.

    @@ -4224,12 +4249,12 @@ write register

    Parameters:

    - +

    - + @@ -4243,32 +4268,32 @@ write register
    Parameters:
    - +
    int slsDetector::writeTrimFile virtual int slsDetector::writeTrimFile ( string  fname,
    ) [pure virtual]

    -writes a trim file for module number imod - the values will be read from the current detector structure

    Parameters:
    +Pure virtual function writes a trim file for module number imod - the values will be read from the current detector structure
    Parameters:
    fname name of the file to be written
    imod module number
    Returns:
    OK or FAIL if the file could not be written
    -
    See also:
    sls_detector_module sharedSlsDetector
    +
    See also:
    sls_detector_module sharedSlsDetector mythenDetector::writeTrimFile(string, int)

    -Reimplemented in mythenDetector, and eigerDetector. +Implemented in mythenDetector, and eigerDetector.

    - +

    - + @@ -4282,24 +4307,24 @@ Reimplemented in +
    int slsDetector::writeTrimFile virtual int slsDetector::writeTrimFile ( string  fname, [pure virtual]

    -writes a trim file

    Parameters:
    +Pure virtual function writes a trim file
    Parameters:
    fname name of the file to be written
    mod module structure which has to be written to file
    Returns:
    OK or FAIL if the file could not be written
    -
    See also:
    sls_detector_module
    +
    See also:
    sls_detector_module mythenDetector::writeTrimFile(string, sls_detector_module)

    -Reimplemented in mythenDetector, and eigerDetector. +Implemented in mythenDetector, and eigerDetector.

    Member Data Documentation

    @@ -4308,7 +4333,7 @@ Reimplemented in - +
    float* slsDetector::adcs [private] float* slsDetector::adcs [protected]
    @@ -4323,7 +4348,7 @@ pointer to adc valuse
    - +
    int* slsDetector::badChannelMask [private] int* slsDetector::badChannelMask [protected]
    @@ -4339,7 +4364,7 @@ pointer to bad channel mask 0 is channel is good 1 if it is bad
    <
    - +
    int* slsDetector::chanregs [private] int* slsDetector::chanregs [protected]
    @@ -4354,7 +4379,7 @@ pointer to channal registers
    - +
    int* slsDetector::chipregs [private] int* slsDetector::chipregs [protected]
    @@ -4369,7 +4394,7 @@ pointer to chip registers
    - +
    MySocketTCP* slsDetector::controlSocket [private] MySocketTCP* slsDetector::controlSocket [protected]
    @@ -4384,7 +4409,7 @@ socket for control commands
    - +
    float slsDetector::currentI0 [private] float slsDetector::currentI0 [protected]
    @@ -4399,7 +4424,7 @@ I0 measured
    - +
    float slsDetector::currentPosition [private] float slsDetector::currentPosition [protected]
    @@ -4414,7 +4439,7 @@ current position of the detector
    - +
    float slsDetector::currentPositionIndex [private] float slsDetector::currentPositionIndex [protected]
    @@ -4429,7 +4454,7 @@ current position index of the detector
    - +
    float* slsDetector::dacs [private] float* slsDetector::dacs [protected]
    @@ -4444,7 +4469,7 @@ pointer to dac valuse
    - +
    pthread_t slsDetector::dataProcessingThread [private] pthread_t slsDetector::dataProcessingThread [protected]
    @@ -4459,7 +4484,7 @@ data processing thread???
    - +
    queue<int*> slsDetector::dataQueue [private] queue<int*> slsDetector::dataQueue [protected]
    @@ -4474,7 +4499,7 @@ data queue
    - +
    MySocketTCP* slsDetector::dataSocket [private] MySocketTCP* slsDetector::dataSocket [protected]
    @@ -4489,7 +4514,7 @@ socket for data acquisition
    - +
    sls_detector_module* slsDetector::detectorModules [private] sls_detector_module* slsDetector::detectorModules [protected]
    @@ -4504,7 +4529,7 @@ pointer to detector module structures
    - +
    int slsDetector::detId [private] int slsDetector::detId [protected]
    @@ -4519,7 +4544,7 @@ detector ID
    - +
    float* slsDetector::ffcoefficients [private] float* slsDetector::ffcoefficients [protected]
    @@ -4534,7 +4559,7 @@ pointer to flat field coefficients
    - +
    float* slsDetector::fferrors [private] float* slsDetector::fferrors [protected]
    @@ -4549,7 +4574,7 @@ pointer to flat field coefficient errors
    - +
    float* slsDetector::mergingBins [private] float* slsDetector::mergingBins [protected]
    @@ -4564,7 +4589,7 @@ merging bins
    - +
    float* slsDetector::mergingCounts [private] float* slsDetector::mergingCounts [protected]
    @@ -4579,7 +4604,7 @@ merging counts
    - +
    float* slsDetector::mergingErrors [private] float* slsDetector::mergingErrors [protected]
    @@ -4594,7 +4619,7 @@ merging errors
    - +
    int* slsDetector::mergingMultiplicity [private] int* slsDetector::mergingMultiplicity [protected]
    @@ -4609,7 +4634,7 @@ merging multiplicity
    - +
    int slsDetector::onlineFlag [private] int slsDetector::onlineFlag [protected]
    @@ -4625,7 +4650,7 @@ merging multiplicity
    - +
    int slsDetector::shmId [private] int slsDetector::shmId [protected]
    @@ -4640,7 +4665,7 @@ shared memeory ID
    - +
    MySocketTCP* slsDetector::stopSocket [private] MySocketTCP* slsDetector::stopSocket [protected]
    @@ -4655,7 +4680,7 @@ socket for emergency stop
    - +
    sharedSlsDetector* slsDetector::thisDetector [private] sharedSlsDetector* slsDetector::thisDetector [protected]
    @@ -4667,7 +4692,7 @@ address of the detector structure in shared memory

    The documentation for this class was generated from the following files:     -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/eigerDetector_8h-source.html b/slsDetectorSoftware/docs/html/eigerDetector_8h-source.html index d4bf9ab5b..463c34636 100644 --- a/slsDetectorSoftware/docs/html/eigerDetector_8h-source.html +++ b/slsDetectorSoftware/docs/html/eigerDetector_8h-source.html @@ -84,7 +84,7 @@ 00168 00169 00170 #endif -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/eigerDetector_8h.html b/slsDetectorSoftware/docs/html/eigerDetector_8h.html index 41f37d903..4c6c094c9 100644 --- a/slsDetectorSoftware/docs/html/eigerDetector_8h.html +++ b/slsDetectorSoftware/docs/html/eigerDetector_8h.html @@ -28,7 +28,7 @@  This is class contains all eiger specific functionalities. More...
    -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/files.html b/slsDetectorSoftware/docs/html/files.html index efe84a44c..f853ba5eb 100644 --- a/slsDetectorSoftware/docs/html/files.html +++ b/slsDetectorSoftware/docs/html/files.html @@ -29,7 +29,7 @@ usersFunctions/usersFunctions.c usersFunctions/usersFunctions.h [code] -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions.html b/slsDetectorSoftware/docs/html/functions.html index 557dea4d2..d34624662 100644 --- a/slsDetectorSoftware/docs/html/functions.html +++ b/slsDetectorSoftware/docs/html/functions.html @@ -59,15 +59,16 @@ Here is a list of all class members with links to the classes they belong to:

    - a -

    -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x62.html b/slsDetectorSoftware/docs/html/functions_0x62.html index d3986ffaf..bae46ae86 100644 --- a/slsDetectorSoftware/docs/html/functions_0x62.html +++ b/slsDetectorSoftware/docs/html/functions_0x62.html @@ -58,12 +58,13 @@ Here is a list of all class members with links to the classes they belong to:

    - b -

    -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x63.html b/slsDetectorSoftware/docs/html/functions_0x63.html index ee6280404..a5c4d1007 100644 --- a/slsDetectorSoftware/docs/html/functions_0x63.html +++ b/slsDetectorSoftware/docs/html/functions_0x63.html @@ -74,13 +74,13 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector
  • correctionMask : slsDetector::sharedSlsDetector
  • createFileName() : slsDetector
  • createModule() -: slsDetector
  • currentI0 +: slsDetector
  • currentI0 : slsDetector
  • currentPosition : slsDetector
  • currentPositionIndex : slsDetector
  • currentSettings : slsDetector::sharedSlsDetector
  • currentThresholdEV : slsDetector::sharedSlsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x64.html b/slsDetectorSoftware/docs/html/functions_0x64.html index a1e1a4989..40a07b072 100644 --- a/slsDetectorSoftware/docs/html/functions_0x64.html +++ b/slsDetectorSoftware/docs/html/functions_0x64.html @@ -66,16 +66,16 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector
  • dataQueue : slsDetector
  • dataSocket : slsDetector
  • decodeData() -: eigerDetector, mythenDetector, slsDetector
  • deleteModule() +: eigerDetector, slsDetector
  • deleteModule() : slsDetector
  • detectorModules : slsDetector
  • detId : slsDetector
  • detPositions : slsDetector::sharedSlsDetector
  • digitalTest() : slsDetector
  • Disconnect() : MySocketTCP
  • dumpDetectorSetup() -: slsDetector
  • dynamicRange +: mythenDetector, slsDetector
  • dynamicRange : slsDetector::sharedSlsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x65.html b/slsDetectorSoftware/docs/html/functions_0x65.html index 9fef7e438..592fb8b3a 100644 --- a/slsDetectorSoftware/docs/html/functions_0x65.html +++ b/slsDetectorSoftware/docs/html/functions_0x65.html @@ -69,7 +69,7 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector
  • exists() : slsDetector
  • exitServer() : slsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x66.html b/slsDetectorSoftware/docs/html/functions_0x66.html index b09c2159a..060323a44 100644 --- a/slsDetectorSoftware/docs/html/functions_0x66.html +++ b/slsDetectorSoftware/docs/html/functions_0x66.html @@ -72,7 +72,7 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector::sharedSlsDetector
  • flatFieldCorrect() : slsDetector
  • freeSharedMemory() : slsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x67.html b/slsDetectorSoftware/docs/html/functions_0x67.html index 2988c617d..3cf690e83 100644 --- a/slsDetectorSoftware/docs/html/functions_0x67.html +++ b/slsDetectorSoftware/docs/html/functions_0x67.html @@ -62,13 +62,13 @@ Here is a list of all class members with links to the classes they belong to: : sls_detector_module
  • GET_ONLINE_FLAG : slsDetector
  • getADC() : slsDetector
  • getAngularConversion() -: mythenDetector, slsDetector
  • getBadChannelCorrections() +: mythenDetector, slsDetector
  • getBadChannelCorrectionFile() +: slsDetector
  • getBadChannelCorrections() : slsDetector
  • getBinSize() -: mythenDetector, slsDetector
  • getCalDir() +: mythenDetector, slsDetector
  • getCalDir() : slsDetector
  • getChannel() -: slsDetector
  • getChip() -: slsDetector
  • getClockDivider() -: slsDetector
  • getControlPort() +: slsDetector
  • getChip() +: slsDetector
  • getControlPort() : slsDetector
  • getDataFromDetector() : slsDetector
  • getDataFromDetectorNoWait() : slsDetector
  • getDataPort() @@ -78,27 +78,26 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector
  • getFileName() : slsDetector
  • getFilePath() : slsDetector
  • getFineOffset() -: mythenDetector, slsDetector
  • getFlatFieldCorrections() +: mythenDetector, slsDetector
  • getFlatFieldCorrections() : slsDetector
  • getGlobalOffset() -: mythenDetector, slsDetector
  • getHostname() +: mythenDetector, slsDetector
  • getHostname() : MySocketTCP, slsDetector
  • getId() : slsDetector
  • getMaxNumberOfModules() : slsDetector
  • getModule() -: slsDetector
  • getPortNumber() +: slsDetector
  • getPortNumber() : MySocketTCP
  • getPositions() -: mythenDetector, slsDetector
  • getRateCorrections() +: mythenDetector, slsDetector
  • getRateCorrections() : slsDetector
  • getRunStatus() -: slsDetector
  • getSetLength() -: slsDetector
  • getSettings() -: slsDetector
  • getStopPort() +: slsDetector
  • getSettings() +: slsDetector
  • getStopPort() : slsDetector
  • getThresholdEnergy() : slsDetector
  • getTimeLeft() : slsDetector
  • getTrimDir() : slsDetector
  • getTrimEn() -: slsDetector
  • giveCalibrationPulse() +: slsDetector
  • giveCalibrationPulse() : slsDetector
  • globalOffset : slsDetector::sharedSlsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x68.html b/slsDetectorSoftware/docs/html/functions_0x68.html index f0d9fe5e1..736d45219 100644 --- a/slsDetectorSoftware/docs/html/functions_0x68.html +++ b/slsDetectorSoftware/docs/html/functions_0x68.html @@ -60,7 +60,7 @@ Here is a list of all class members with links to the classes they belong to:

    - h -

    -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x69.html b/slsDetectorSoftware/docs/html/functions_0x69.html index 1a521e886..df8c7c71a 100644 --- a/slsDetectorSoftware/docs/html/functions_0x69.html +++ b/slsDetectorSoftware/docs/html/functions_0x69.html @@ -64,7 +64,7 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector
  • iptr : iarray
  • is_a_server : MySocketTCP -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x6c.html b/slsDetectorSoftware/docs/html/functions_0x6c.html index 2a8b8a393..425adc84d 100644 --- a/slsDetectorSoftware/docs/html/functions_0x6c.html +++ b/slsDetectorSoftware/docs/html/functions_0x6c.html @@ -61,7 +61,7 @@ Here is a list of all class members with links to the classes they belong to:
  • last_keep_connection_open_action_was_a_send : MySocketTCP
  • len : iarray -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x6d.html b/slsDetectorSoftware/docs/html/functions_0x6d.html index 0c4578ff5..4935547a0 100644 --- a/slsDetectorSoftware/docs/html/functions_0x6d.html +++ b/slsDetectorSoftware/docs/html/functions_0x6d.html @@ -66,9 +66,8 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector::sharedSlsDetector
  • module : sls_detector_module, sls_detector_chip, sls_detector_channel
  • myDetectorType : slsDetector::sharedSlsDetector
  • MySocketTCP() -: MySocketTCP
  • mythenDetector() -: mythenDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +: MySocketTCP +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x6e.html b/slsDetectorSoftware/docs/html/functions_0x6e.html index 705d164af..643f5a310 100644 --- a/slsDetectorSoftware/docs/html/functions_0x6e.html +++ b/slsDetectorSoftware/docs/html/functions_0x6e.html @@ -76,7 +76,7 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector::sharedSlsDetector
  • nTrimEn : slsDetector::sharedSlsDetector
  • numberOfPositions : slsDetector::sharedSlsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x6f.html b/slsDetectorSoftware/docs/html/functions_0x6f.html index bb21d8dbf..2e797b297 100644 --- a/slsDetectorSoftware/docs/html/functions_0x6f.html +++ b/slsDetectorSoftware/docs/html/functions_0x6f.html @@ -63,7 +63,7 @@ Here is a list of all class members with links to the classes they belong to: : angleConversionConstant, sls_detector_module
  • ONLINE_FLAG : slsDetector
  • onlineFlag : slsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x70.html b/slsDetectorSoftware/docs/html/functions_0x70.html index da53d0402..01684eb2b 100644 --- a/slsDetectorSoftware/docs/html/functions_0x70.html +++ b/slsDetectorSoftware/docs/html/functions_0x70.html @@ -61,8 +61,8 @@ Here is a list of all class members with links to the classes they belong to:
  • popDataQueue() : slsDetector
  • portno : MySocketTCP
  • processData() -: slsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +: mythenDetector, slsDetector +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x72.html b/slsDetectorSoftware/docs/html/functions_0x72.html index 58c81e089..62f804a29 100644 --- a/slsDetectorSoftware/docs/html/functions_0x72.html +++ b/slsDetectorSoftware/docs/html/functions_0x72.html @@ -62,13 +62,13 @@ Here is a list of all class members with links to the classes they belong to: : angleConversionConstant
  • rateCorrect() : slsDetector
  • readAll() : slsDetector
  • readAngularConversion() -: mythenDetector, slsDetector
  • readCalibrationFile() -: eigerDetector, mythenDetector, slsDetector
  • readConfigurationFile() -: slsDetector
  • readDataFile() -: eigerDetector, mythenDetector, slsDetector
  • readFrame() +: mythenDetector, slsDetector
  • readCalibrationFile() +: eigerDetector, mythenDetector, slsDetector
  • readConfigurationFile() +: mythenDetector, slsDetector
  • readDataFile() +: eigerDetector, mythenDetector, slsDetector
  • readFrame() : slsDetector
  • readRegister() : slsDetector
  • readTrimFile() -: eigerDetector, mythenDetector, slsDetector
  • receiveChannel() +: eigerDetector, mythenDetector, slsDetector
  • receiveChannel() : slsDetector
  • receiveChip() : slsDetector
  • ReceiveData() : MySocketTCP
  • ReceiveDataAndKeepConnection() @@ -76,11 +76,11 @@ Here is a list of all class members with links to the classes they belong to: : MySocketTCP
  • receiveModule() : slsDetector
  • reg : sls_detector_module, sls_detector_chip, sls_detector_channel
  • resetMerging() -: mythenDetector, slsDetector
  • retrieveDetectorSetup() -: slsDetector
  • roFlags +: mythenDetector, slsDetector
  • retrieveDetectorSetup() +: mythenDetector, slsDetector
  • roFlags : slsDetector::sharedSlsDetector
  • roiLimits : slsDetector::sharedSlsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x73.html b/slsDetectorSoftware/docs/html/functions_0x73.html index dc80765fe..f6639bd13 100644 --- a/slsDetectorSoftware/docs/html/functions_0x73.html +++ b/slsDetectorSoftware/docs/html/functions_0x73.html @@ -68,13 +68,12 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector
  • serialnumber : sls_detector_module
  • serverAddress : MySocketTCP
  • setAngularConversion() -: mythenDetector, slsDetector
  • setBadChannelCorrection() +: mythenDetector, slsDetector
  • setBadChannelCorrection() : slsDetector
  • setBinSize() -: mythenDetector, slsDetector
  • setCalDir() +: mythenDetector, slsDetector
  • setCalDir() : slsDetector
  • setChannel() : slsDetector
  • setChip() -: slsDetector
  • setClockDivider() -: slsDetector
  • setDAC() +: slsDetector
  • setDAC() : slsDetector
  • setDetectorType() : slsDetector
  • setDynamicRange() : slsDetector
  • setExternalCommunicationMode() @@ -83,18 +82,18 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector
  • setFileName() : slsDetector
  • setFilePath() : slsDetector
  • setFineOffset() -: mythenDetector, slsDetector
  • setFlatFieldCorrection() +: mythenDetector, slsDetector
  • setFlatFieldCorrection() : slsDetector
  • setGlobalOffset() -: mythenDetector, slsDetector
  • setModule() +: mythenDetector, slsDetector
  • setModule() : slsDetector
  • setNumberOfModules() : slsDetector
  • setOnline() : slsDetector
  • setPositions() -: mythenDetector, slsDetector
  • setRateCorrection() +: mythenDetector, slsDetector
  • setRateCorrection() : slsDetector
  • setReadOutFlags() : slsDetector
  • setROI() -: slsDetector
  • setSetLength() -: slsDetector
  • setSettings() -: slsDetector
  • setTCPSocket() +: slsDetector
  • setSettings() +: slsDetector
  • setSpeed() +: slsDetector
  • setTCPSocket() : slsDetector
  • setThresholdEnergy() : slsDetector
  • setTimer() : slsDetector
  • setTrimDir() @@ -111,7 +110,7 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector
  • stopPort : slsDetector::sharedSlsDetector
  • stopSocket : slsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x74.html b/slsDetectorSoftware/docs/html/functions_0x74.html index 579786a88..3f01e2d43 100644 --- a/slsDetectorSoftware/docs/html/functions_0x74.html +++ b/slsDetectorSoftware/docs/html/functions_0x74.html @@ -65,7 +65,7 @@ Here is a list of all class members with links to the classes they belong to: : slsDetector::sharedSlsDetector
  • trimDir : slsDetector::sharedSlsDetector
  • trimEnergies : slsDetector::sharedSlsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x77.html b/slsDetectorSoftware/docs/html/functions_0x77.html index 72ab3ee7d..fb1e4bc53 100644 --- a/slsDetectorSoftware/docs/html/functions_0x77.html +++ b/slsDetectorSoftware/docs/html/functions_0x77.html @@ -59,13 +59,13 @@ Here is a list of all class members with links to the classes they belong to:

    - w -

    -
    Generated on Fri Oct 9 16:01:04 2009 by  +: eigerDetector, mythenDetector, slsDetector +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x78.html b/slsDetectorSoftware/docs/html/functions_0x78.html index 0555e6f36..1de33b6ed 100644 --- a/slsDetectorSoftware/docs/html/functions_0x78.html +++ b/slsDetectorSoftware/docs/html/functions_0x78.html @@ -61,7 +61,7 @@ Here is a list of all class members with links to the classes they belong to:
  • xmax : ROI
  • xmin : ROI -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x79.html b/slsDetectorSoftware/docs/html/functions_0x79.html index 0a1480d8d..6266c43b0 100644 --- a/slsDetectorSoftware/docs/html/functions_0x79.html +++ b/slsDetectorSoftware/docs/html/functions_0x79.html @@ -61,7 +61,7 @@ Here is a list of all class members with links to the classes they belong to:
  • ymax : ROI
  • ymin : ROI -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_0x7e.html b/slsDetectorSoftware/docs/html/functions_0x7e.html index a78c2bc77..b954894ef 100644 --- a/slsDetectorSoftware/docs/html/functions_0x7e.html +++ b/slsDetectorSoftware/docs/html/functions_0x7e.html @@ -60,10 +60,9 @@ Here is a list of all class members with links to the classes they belong to:

    - ~ -

    -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_eval.html b/slsDetectorSoftware/docs/html/functions_eval.html index eb5b8b72f..bb5bee277 100644 --- a/slsDetectorSoftware/docs/html/functions_eval.html +++ b/slsDetectorSoftware/docs/html/functions_eval.html @@ -35,7 +35,7 @@ : slsDetector
  • OFFLINE_FLAG : slsDetector
  • ONLINE_FLAG : slsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_func.html b/slsDetectorSoftware/docs/html/functions_func.html index a1b1d72e4..490ca75d1 100644 --- a/slsDetectorSoftware/docs/html/functions_func.html +++ b/slsDetectorSoftware/docs/html/functions_func.html @@ -51,21 +51,21 @@

    - a -

    - c -

    +: slsDetector

    - d -

    +: mythenDetector, slsDetector

    - e -

    - p -

    +: mythenDetector, slsDetector

    - r -

    +: mythenDetector, slsDetector
  • retrieveDetectorSetup() +: mythenDetector, slsDetector

    - s -

    - w -

    +: eigerDetector, mythenDetector, slsDetector

    - ~ -

    -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_type.html b/slsDetectorSoftware/docs/html/functions_type.html index c90b0b88f..448392ba0 100644 --- a/slsDetectorSoftware/docs/html/functions_type.html +++ b/slsDetectorSoftware/docs/html/functions_type.html @@ -33,7 +33,7 @@ -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/functions_vars.html b/slsDetectorSoftware/docs/html/functions_vars.html index 632771c47..79aefe74d 100644 --- a/slsDetectorSoftware/docs/html/functions_vars.html +++ b/slsDetectorSoftware/docs/html/functions_vars.html @@ -59,11 +59,13 @@
  • adcoff : slsDetector::sharedSlsDetector
  • adcs : sls_detector_module, slsDetector
  • alreadyExisting -: slsDetector::sharedSlsDetector
  • angDirection +: slsDetector::sharedSlsDetector
  • angConvFile +: slsDetector::sharedSlsDetector
  • angDirection : slsDetector::sharedSlsDetector
  • angOff : slsDetector::sharedSlsDetector

    - b -

    -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/globals.html b/slsDetectorSoftware/docs/html/globals.html index 53598671c..dfa2308d7 100644 --- a/slsDetectorSoftware/docs/html/globals.html +++ b/slsDetectorSoftware/docs/html/globals.html @@ -30,26 +30,27 @@
    @@ -66,232 +67,7 @@ Here is a list of all file members with links to the files they belong to: : sls_detector_defs.h
  • AUTO : sls_detector_defs.h
  • AVERAGE_NEIGHBOURS_FOR_BAD_CHANNELS : sls_detector_defs.h -

    - b -

    -

    - c -

    -

    - d -

    -

    - e -

    -

    - f -

    -

    - g -

    -

    - h -

    -

    - i -

    -

    - m -

    -

    - n -

    -

    - o -

    -

    - p -

    -

    - r -

    -

    - s -

    -

    - t -

    -

    - u -

    -

    - x -

    -

    - y -

    -

    - z -

    -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/globals_defs.html b/slsDetectorSoftware/docs/html/globals_defs.html index eb3c1528c..13f5b4a52 100644 --- a/slsDetectorSoftware/docs/html/globals_defs.html +++ b/slsDetectorSoftware/docs/html/globals_defs.html @@ -35,7 +35,7 @@ : slsDetector.h
  • DEFAULT_PORTNO : MySocketTCP.h
  • DEFAULT_SHM_KEY : slsDetector.h
  • defaultTDead -: slsDetector.h
  • GET_FLAG +: mythenDetector.h, slsDetector.h
  • GET_FLAG : sls_detector_defs.h
  • MAX_BADCHANS : slsDetector.h
  • MAX_ROIS : slsDetector.h
  • MAX_STR_LENGTH @@ -50,7 +50,7 @@ : slsDetector.h
  • PI : usersFunctions.h
  • SEND_REC_MAX_SIZE : MySocketTCP.h -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/globals_enum.html b/slsDetectorSoftware/docs/html/globals_enum.html index 17843b1f5..82d35d0aa 100644 --- a/slsDetectorSoftware/docs/html/globals_enum.html +++ b/slsDetectorSoftware/docs/html/globals_enum.html @@ -47,10 +47,11 @@ : sls_detector_defs.h
  • moduleRegisterBit : sls_detector_defs.h
  • numberOf : sls_detector_defs.h
  • readOutFlags -: sls_detector_defs.h
  • timerIndex +: sls_detector_defs.h
  • speedVariable +: sls_detector_defs.h
  • timerIndex : sls_detector_defs.h
  • trimMode : sls_detector_defs.h -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/globals_eval.html b/slsDetectorSoftware/docs/html/globals_eval.html index 32fad025e..d2291767c 100644 --- a/slsDetectorSoftware/docs/html/globals_eval.html +++ b/slsDetectorSoftware/docs/html/globals_eval.html @@ -47,6 +47,7 @@
  • s
  • t
  • u
    • +
  • w
  • x
  • y
  • z
    • @@ -74,7 +75,8 @@ : sls_detector_defs.h
  • CALIBRATION_PULSES : sls_detector_defs.h
  • CHIP_OUTPUT_WIDTH : sls_detector_defs.h
  • CHIP_TEST -: sls_detector_defs.h
  • COMPARATOR_ENABLE +: sls_detector_defs.h
  • CLOCK_DIVIDER +: sls_detector_defs.h
  • COMPARATOR_ENABLE : sls_detector_defs.h
  • CYCLES_NUMBER : sls_detector_defs.h

    - d -

    - s -

    +

    - w -

    - x -

    @@ -249,7 +257,7 @@
  • Z : sls_detector_defs.h
  • ZERO_COMPRESSION : sls_detector_defs.h -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/globals_func.html b/slsDetectorSoftware/docs/html/globals_func.html index 2a6cb3ff5..67ace4738 100644 --- a/slsDetectorSoftware/docs/html/globals_func.html +++ b/slsDetectorSoftware/docs/html/globals_func.html @@ -37,7 +37,7 @@ : usersFunctions.c, usersFunctions.h
  • go_to_position() : usersFunctions.c, usersFunctions.h
  • go_to_position_no_wait() : usersFunctions.c, usersFunctions.h -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/globals_vars.html b/slsDetectorSoftware/docs/html/globals_vars.html index 2d3e74cda..ed4622654 100644 --- a/slsDetectorSoftware/docs/html/globals_vars.html +++ b/slsDetectorSoftware/docs/html/globals_vars.html @@ -33,7 +33,7 @@ -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/hierarchy.html b/slsDetectorSoftware/docs/html/hierarchy.html index e7fb78bf1..bbe4d9601 100644 --- a/slsDetectorSoftware/docs/html/hierarchy.html +++ b/slsDetectorSoftware/docs/html/hierarchy.html @@ -34,7 +34,7 @@
  • slsDetector::sharedSlsDetector -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/index.html b/slsDetectorSoftware/docs/html/index.html index f0217bd9f..d70505339 100644 --- a/slsDetectorSoftware/docs/html/index.html +++ b/slsDetectorSoftware/docs/html/index.html @@ -26,11 +26,16 @@ The architecture of the acquisitions system is intended as follows:
    • C++ classes common to all detectors for client-server communication. These can be supplied to users as libraries and embedded also in acquisition systems which are not developed by the SLS
      See also:
      MySocketTCP slsDetector
    • the possibility of using a Qt-based graphical user interface (with eventually root analisys capabilities)
      • -
    • the possibility of runnin alla commands from command line. In order to ensure a fast operation of this so called "text client" the detector parameters should not be re-initialized everytime. For this reason a shared memory block is allocated where the main detector flags and parameters are stored
      See also:
      slsDetector::sharedSlsDetector
      -
      Author:
      Anna Bergamaschi
      +
    • the possibility of runnin alla commands from command line. In order to ensure a fast operation of this so called "text client" the detector parameters should not be re-initialized everytime. For this reason a shared memory block is allocated where the main detector flags and parameters are stored
      See also:
      slsDetector::sharedSlsDetector
    -
    Generated on Fri Oct 9 16:01:04 2009 by  +

    +How to use it

    +The best way to operate the slsDetectors is to use the software (text client or GUI) developed by the sls detectors group. In case you need to embed the detector control in a previously existing software, compile these classes using
    + make package
    + and link the shared library created to your software bin/libSlsDetector.so.1.0.1 Then in your software you should use the class related to the detector you want to control (mythenDetector or eigerDetector).

    +

    Author:
    Anna Bergamaschi
    +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/mythenDetector_8h-source.html b/slsDetectorSoftware/docs/html/mythenDetector_8h-source.html index 59db5d845..e93e5a1cc 100644 --- a/slsDetectorSoftware/docs/html/mythenDetector_8h-source.html +++ b/slsDetectorSoftware/docs/html/mythenDetector_8h-source.html @@ -24,97 +24,103 @@ 00004 #ifndef MYTHEN_DETECTOR_H 00005 #define MYTHEN_DETECTOR_H 00006 -00007 using namespace std; +00007 #include "slsDetector.h" 00008 -00009 -00010 -00022 #include "slsDetector.h" -00023 -00024 class mythenDetector : public slsDetector{ +00009 #define defaultTDead {170,90,750} +00010 +00011 using namespace std; +00023 class mythenDetector : public slsDetector{ +00024 00025 00026 -00027 -00028 public: -00029 -00030 -00031 -00038 mythenDetector(int id=0); -00039 //slsDetector(string const fname); -00041 ~mythenDetector(){}; -00042 -00043 -00044 -00052 sls_detector_module* readTrimFile(string fname, sls_detector_module* myMod=NULL); -00053 -00062 int writeTrimFile(string fname, sls_detector_module mod); -00063 -00071 int writeTrimFile(string fname, int imod); -00072 -00073 -00087 int writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1); -00088 -00095 int writeDataFile(string fname, int *data); -00096 -00110 int readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0); -00111 -00118 int readDataFile(string fname, int *data); -00119 -00132 int readCalibrationFile(string fname, float &gain, float &offset); -00133 -00141 int writeCalibrationFile(string fname, float gain, float offset); -00142 -00143 -00149 int readAngularConversion(string fname=""); -00155 int writeAngularConversion(string fname=""); -00156 -00157 -00158 -00159 /* Communication to server */ -00160 -00161 // Tests and identification -00162 -00168 int setAngularConversion(string fname=""); -00169 -00176 int getAngularConversion(int &direction, angleConversionConstant *angconv=NULL); -00177 -00181 float setGlobalOffset(float f){thisDetector->globalOffset=f; return thisDetector->globalOffset;}; +00027 public: +00031 mythenDetector(int id=0) : slsDetector(MYTHEN, id); +00032 //slsDetector(string const fname); +00033 // ~slsDetector(){while(dataQueue.size()>0){}}; +00035 ~mythenDetector(){}; +00036 +00037 +00038 int readConfigurationFile(string const fname); +00050 int writeConfigurationFile(string const fname); +00051 +00052 +00053 /* +00054 It should be possible to dump all the settings of the detector (including trimbits, threshold energy, gating/triggering, acquisition time etc. +00055 in a file and retrieve it for repeating the measurement with identicals ettings, if necessary +00056 */ +00062 int dumpDetectorSetup(string const fname); +00068 int retrieveDetectorSetup(string const fname); +00069 +00070 +00071 +00079 sls_detector_module* readTrimFile(string fname, sls_detector_module* myMod=NULL); +00080 +00089 int writeTrimFile(string fname, sls_detector_module mod); +00090 +00098 int writeTrimFile(string fname, int imod); +00099 +00113 int writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1); +00114 +00121 int writeDataFile(string fname, int *data); +00122 +00136 int readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0); +00137 +00144 int readDataFile(string fname, int *data); +00145 +00146 +00154 int readCalibrationFile(string fname, float &gain, float &offset); +00162 int writeCalibrationFile(string fname, float gain, float offset); +00163 +00164 +00170 int readAngularConversion(string fname=""); +00176 int writeAngularConversion(string fname=""); +00177 +00178 +00179 +00180 +00181 //Corrections 00182 -00186 float setFineOffset(float f){thisDetector->fineOffset=f; return thisDetector->fineOffset;}; -00190 float getFineOffset(){return thisDetector->fineOffset;}; -00191 -00195 float getGlobalOffset(){return thisDetector->globalOffset;}; -00196 -00203 int setPositions(int nPos, float *pos){thisDetector->numberOfPositions=nPos; for (int ip=0; ip<nPos; ip++) thisDetector->detPositions[ip]=pos[ip]; return thisDetector->numberOfPositions;}; -00209 int getPositions(float *pos=NULL){ if (pos ) {for (int ip=0; ip<thisDetector->numberOfPositions; ip++) pos[ip]=thisDetector->detPositions[ip];} return thisDetector->numberOfPositions;}; -00210 -00211 -00213 float setBinSize(float bs) {thisDetector->binSize=bs; return thisDetector->binSize;} -00215 float getBinSize() {return thisDetector->binSize;} -00216 -00217 -00218 -00219 -00220 +00183 +00189 int setAngularConversion(string fname=""); +00190 +00197 int getAngularConversion(int &direction, angleConversionConstant *angconv=NULL); +00198 +00199 +00201 char *getAngularConversion() {return thisDetector->angConvFile;}; +00202 +00206 float setGlobalOffset(float f){thisDetector->globalOffset=f; return thisDetector->globalOffset;}; +00207 +00211 float setFineOffset(float f){thisDetector->fineOffset=f; return thisDetector->fineOffset;}; +00215 float getFineOffset(){return thisDetector->fineOffset;}; +00216 +00220 float getGlobalOffset(){return thisDetector->globalOffset;}; 00221 -00227 float* decodeData(int *datain); -00228 -00229 -00230 -00231 int resetMerging(float *mp, float *mv,float *me, int *mm); -00242 int addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv,float *me, int *mm); +00228 int setPositions(int nPos, float *pos){thisDetector->numberOfPositions=nPos; for (int ip=0; ip<nPos; ip++) thisDetector->detPositions[ip]=pos[ip]; return thisDetector->numberOfPositions;}; +00234 int getPositions(float *pos=NULL){ if (pos ) {for (int ip=0; ip<thisDetector->numberOfPositions; ip++) pos[ip]=thisDetector->detPositions[ip];} return thisDetector->numberOfPositions;}; +00235 +00236 +00238 float setBinSize(float bs) {thisDetector->binSize=bs; return thisDetector->binSize;} +00240 float getBinSize() {return thisDetector->binSize;} +00241 +00242 00243 -00252 int finalizeMerging(float *mp, float *mv,float *me, int *mm); -00253 -00254 -00255 -00256 private: -00257 -00258 -00259 }; -00260 -00261 -00262 #endif -
    Generated on Fri Oct 9 16:01:04 2009 by  +00244 +00252 int resetMerging(float *mp, float *mv,float *me, int *mm); +00262 int addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv,float *me, int *mm); +00263 +00272 int finalizeMerging(float *mp, float *mv,float *me, int *mm); +00273 +00274 +00278 void* processData(); // thread function +00279 +00288 void acquire(); +00289 +00290 +00291 }; +00292 +00293 +00294 #endif +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/mythenDetector_8h.html b/slsDetectorSoftware/docs/html/mythenDetector_8h.html index 55ab7a8c1..b7118e31e 100644 --- a/slsDetectorSoftware/docs/html/mythenDetector_8h.html +++ b/slsDetectorSoftware/docs/html/mythenDetector_8h.html @@ -26,9 +26,27 @@

    Classes

    class  mythenDetector - This calss contains all mythen specific functions. More...
    +

    Defines

    +#define defaultTDead   {170,90,750} + -
    Generated on Fri Oct 9 16:01:04 2009 by  +

    Define Documentation

    + +
    +
    + + + + +
    #define defaultTDead   {170,90,750}
    +
    +
    + +

    + +

    +

    +

    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/namespaces.html b/slsDetectorSoftware/docs/html/namespaces.html index 8c83d98ad..41f8460f6 100644 --- a/slsDetectorSoftware/docs/html/namespaces.html +++ b/slsDetectorSoftware/docs/html/namespaces.html @@ -16,7 +16,7 @@

    Namespace List

    Here is a list of all namespaces with brief descriptions:
    std
    -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/namespacestd.html b/slsDetectorSoftware/docs/html/namespacestd.html index 65e50282a..230fe4118 100644 --- a/slsDetectorSoftware/docs/html/namespacestd.html +++ b/slsDetectorSoftware/docs/html/namespacestd.html @@ -18,7 +18,7 @@
    -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/pages.html b/slsDetectorSoftware/docs/html/pages.html index 84c34fc2d..d693c9cd6 100644 --- a/slsDetectorSoftware/docs/html/pages.html +++ b/slsDetectorSoftware/docs/html/pages.html @@ -17,7 +17,7 @@
  • Bug List -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/slsDetector_8cpp.html b/slsDetectorSoftware/docs/html/slsDetector_8cpp.html index dad5a408a..82db797f7 100644 --- a/slsDetectorSoftware/docs/html/slsDetector_8cpp.html +++ b/slsDetectorSoftware/docs/html/slsDetector_8cpp.html @@ -26,7 +26,7 @@
    -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/slsDetector_8h-source.html b/slsDetectorSoftware/docs/html/slsDetector_8h-source.html index 0febaa00a..8c72f1a0f 100644 --- a/slsDetectorSoftware/docs/html/slsDetector_8h-source.html +++ b/slsDetectorSoftware/docs/html/slsDetector_8h-source.html @@ -42,475 +42,481 @@ 00022 #include <sys/uio.h> 00023 00024 -00025 #define MAX_TIMERS 10 -00026 #define MAX_ROIS 100 -00027 #define MAX_BADCHANS 2000 -00028 #define MAXPOS 50 -00029 -00030 #define NMODMAXX 24 -00031 #define NMODMAXY 24 -00032 #define MAXMODS 36 -00033 #define NCHIPSMAX 10 -00034 #define NCHANSMAX 65536 -00035 #define NDACSMAX 16 -00036 -00037 #define DEFAULT_HOSTNAME "localhost" -00038 #define DEFAULT_SHM_KEY 5678 -00039 -00040 #define defaultTDead {170,90,750} +00025 #include "sls_detector_defs.h" +00026 +00027 #define MAX_TIMERS 10 +00028 #define MAX_ROIS 100 +00029 #define MAX_BADCHANS 2000 +00030 #define MAXPOS 50 +00031 +00032 #define NMODMAXX 24 +00033 #define NMODMAXY 24 +00034 #define MAXMODS 36 +00035 #define NCHIPSMAX 10 +00036 #define NCHANSMAX 65536 +00037 #define NDACSMAX 16 +00038 +00039 #define DEFAULT_HOSTNAME "localhost" +00040 #define DEFAULT_SHM_KEY 5678 00041 -00042 using namespace std; -00078 class slsDetector { -00079 -00080 -00081 -00082 public: -00083 -00084 -00086 enum {GET_ONLINE_FLAG, -00087 OFFLINE_FLAG, -00088 ONLINE_FLAG -00089 }; +00042 #define defaultTDead {170,90,750} +00044 using namespace std; +00045 +00084 class slsDetector { +00085 +00086 +00087 +00088 public: +00089 00090 -00091 -00092 #include "sls_detector_defs.h" -00093 -00094 -00099 typedef struct sharedSlsDetector { -00101 int alreadyExisting; -00102 -00104 char hostname[MAX_STR_LENGTH]; -00106 int controlPort; -00108 int stopPort; -00110 int dataPort; -00111 -00113 detectorType myDetectorType; -00114 +00092 enum {GET_ONLINE_FLAG, +00093 OFFLINE_FLAG, +00094 ONLINE_FLAG +00095 }; +00096 +00097 +00098 +00103 typedef struct sharedSlsDetector { +00105 int alreadyExisting; +00106 +00108 char hostname[MAX_STR_LENGTH]; +00110 int controlPort; +00112 int stopPort; +00114 int dataPort; 00115 -00117 char trimDir[MAX_STR_LENGTH]; -00119 char calDir[MAX_STR_LENGTH]; -00121 int nTrimEn; -00123 int trimEnergies[100]; -00124 -00125 -00127 int fileIndex; -00129 char filePath[MAX_STR_LENGTH]; -00131 char fileName[MAX_STR_LENGTH]; -00132 -00133 /* size of the detector */ -00134 -00136 int nMod[2]; -00138 int nMods; -00140 int nModMax[2]; -00142 int nModsMax; -00144 int nChans; -00146 int nChips; -00148 int nDacs; -00150 int nAdcs; -00152 int dynamicRange; -00154 int dataBytes; -00155 -00157 int correctionMask; -00159 float tDead; -00161 int nBadChans; -00163 int badChansList[MAX_BADCHANS]; -00165 int nBadFF; -00167 int badFFList[MAX_BADCHANS]; -00168 -00170 angleConversionConstant angOff[MAXMODS]; -00172 int angDirection; -00174 float fineOffset; -00176 float globalOffset; -00178 int numberOfPositions; -00180 float detPositions[MAXPOS]; -00182 float binSize; -00183 -00184 /* infos necessary for the readout to determine the size of the data */ -00186 int nROI; -00188 ROI roiLimits[MAX_ROIS]; -00190 readOutFlags roFlags; +00117 detectorType myDetectorType; +00118 +00119 +00121 char trimDir[MAX_STR_LENGTH]; +00123 char calDir[MAX_STR_LENGTH]; +00125 int nTrimEn; +00127 int trimEnergies[100]; +00128 +00129 +00131 int fileIndex; +00133 char filePath[MAX_STR_LENGTH]; +00135 char fileName[MAX_STR_LENGTH]; +00136 +00137 /* size of the detector */ +00138 +00140 int nMod[2]; +00142 int nMods; +00144 int nModMax[2]; +00146 int nModsMax; +00148 int nChans; +00150 int nChips; +00152 int nDacs; +00154 int nAdcs; +00156 int dynamicRange; +00158 int dataBytes; +00159 +00161 int correctionMask; +00163 float tDead; +00165 int nBadChans; +00167 char badChanFile[MAX_STR_LENGTH]; +00169 int badChansList[MAX_BADCHANS]; +00171 int nBadFF; +00173 int badFFList[MAX_BADCHANS]; +00174 +00176 char angConvFile[MAX_STR_LENGTH]; +00178 angleConversionConstant angOff[MAXMODS]; +00180 int angDirection; +00182 float fineOffset; +00184 float globalOffset; +00186 int numberOfPositions; +00188 float detPositions[MAXPOS]; +00190 float binSize; 00191 -00192 /* detector setup - not needed */ -00194 detectorSettings currentSettings; -00196 int currentThresholdEV; -00198 int64_t timerValue[MAX_TIMERS]; -00200 int clkDiv; -00201 -00202 /*offsets*/ -00204 int ffoff; -00206 int fferroff; -00208 int modoff; -00210 int dacoff; -00212 int adcoff; -00214 int chipoff; -00216 int chanoff; -00217 -00218 } sharedSlsDetector; -00219 -00220 -00221 -00228 slsDetector(detectorType type=GENERIC, int id=0); -00229 //slsDetector(string const fname); -00230 // ~slsDetector(){while(dataQueue.size()>0){}}; -00232 ~slsDetector(){}; -00233 -00234 -00237 int setOnline(int const online); -00240 int exists() {return thisDetector->alreadyExisting;}; +00192 /* infos necessary for the readout to determine the size of the data */ +00194 int nROI; +00196 ROI roiLimits[MAX_ROIS]; +00198 readOutFlags roFlags; +00199 +00200 /* detector setup - not needed */ +00202 detectorSettings currentSettings; +00204 int currentThresholdEV; +00206 int64_t timerValue[MAX_TIMERS]; +00208 int clkDiv; +00209 +00210 /*offsets*/ +00212 int ffoff; +00214 int fferroff; +00216 int modoff; +00218 int dacoff; +00220 int adcoff; +00222 int chipoff; +00224 int chanoff; +00225 +00226 } sharedSlsDetector; +00227 +00228 +00229 +00236 slsDetector(detectorType type=GENERIC, int id=0); +00237 //slsDetector(string const fname); +00238 // ~slsDetector(){while(dataQueue.size()>0){}}; +00240 ~slsDetector(){}; 00241 -00254 int readConfigurationFile(string const fname); -00266 int writeConfigurationFile(string const fname); -00267 -00268 -00269 /* -00270 It should be possible to dump all the settings of the detector (including trimbits, threshold energy, gating/triggering, acquisition time etc. -00271 in a file and retrieve it for repeating the measurement with identicals ettings, if necessary -00272 */ -00278 int dumpDetectorSetup(string const fname); -00284 int retrieveDetectorSetup(string const fname); -00285 -00297 int setTCPSocket(string const name="", int const control_port=-1, int const stop_port=-1, int const data_port=-1); -00299 char* getHostname() {return thisDetector->hostname;}; -00301 int getControlPort() {return thisDetector->controlPort;}; -00303 int getStopPort() {return thisDetector->stopPort;}; -00305 int getDataPort() {return thisDetector->dataPort;}; -00306 -00307 -00308 /* I/O */ -00310 char* getTrimDir() {return thisDetector->trimDir;}; -00312 char* setTrimDir(string s) {sprintf(thisDetector->trimDir, s.c_str()); return thisDetector->trimDir;}; -00319 int getTrimEn(int *en) {for (int ien=0; ien<thisDetector->nTrimEn; ien++) en[ien]=thisDetector->trimEnergies[ien]; return (thisDetector->nTrimEn);}; -00320 -00328 sls_detector_module* readTrimFile(string fname, sls_detector_module* myMod=NULL); -00329 -00338 int writeTrimFile(string fname, sls_detector_module mod); +00242 +00245 int setOnline(int const online); +00248 int exists() {return thisDetector->alreadyExisting;}; +00249 +00256 virtual int readConfigurationFile(string const fname)=0; +00262 virtual int writeConfigurationFile(string const fname)=0; +00263 +00264 +00265 /* +00266 It should be possible to dump all the settings of the detector (including trimbits, threshold energy, gating/triggering, acquisition time etc. +00267 in a file and retrieve it for repeating the measurement with identicals ettings, if necessary +00268 */ +00275 virtual int dumpDetectorSetup(string const fname)=0; +00281 virtual int retrieveDetectorSetup(string const fname)=0; +00282 +00294 int setTCPSocket(string const name="", int const control_port=-1, int const stop_port=-1, int const data_port=-1); +00296 char* getHostname() {return thisDetector->hostname;}; +00298 int getControlPort() {return thisDetector->controlPort;}; +00300 int getStopPort() {return thisDetector->stopPort;}; +00302 int getDataPort() {return thisDetector->dataPort;}; +00303 +00304 +00305 /* I/O */ +00307 char* getTrimDir() {return thisDetector->trimDir;}; +00309 char* setTrimDir(string s) {sprintf(thisDetector->trimDir, s.c_str()); return thisDetector->trimDir;}; +00316 int getTrimEn(int *en=NULL) {if (en) {for (int ien=0; ien<thisDetector->nTrimEn; ien++) en[ien]=thisDetector->trimEnergies[ien];} return (thisDetector->nTrimEn);}; +00317 +00327 virtual sls_detector_module* readTrimFile(string fname, sls_detector_module* myMod=NULL)=0; +00328 +00338 virtual int writeTrimFile(string fname, sls_detector_module mod)=0; 00339 -00347 int writeTrimFile(string fname, int imod); -00348 -00353 char* setFilePath(string s) {sprintf(thisDetector->filePath, s.c_str()); return thisDetector->filePath;}; -00354 -00359 char* setFileName(string s) {sprintf(thisDetector->fileName, s.c_str()); return thisDetector->fileName;}; -00360 -00365 int setFileIndex(int i) {thisDetector->fileIndex=i; return thisDetector->fileIndex;}; -00366 -00371 char* getFilePath() {return thisDetector->filePath;}; -00372 -00377 char* getFileName() {return thisDetector->fileName;}; -00378 -00383 int getFileIndex() {return thisDetector->fileIndex;}; -00384 -00396 string createFileName(); -00397 -00411 int writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1); -00412 -00419 int writeDataFile(string fname, int *data); -00420 -00434 int readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0); -00435 -00442 int readDataFile(string fname, int *data); -00443 -00448 char* getCalDir() {return thisDetector->calDir;}; -00453 char* setCalDir(string s) {sprintf(thisDetector->calDir, s.c_str()); return thisDetector->calDir;}; -00461 int readCalibrationFile(string fname, float &gain, float &offset); -00469 int writeCalibrationFile(string fname, float gain, float offset); -00470 -00471 -00477 int readAngularConversion(string fname=""); -00483 int writeAngularConversion(string fname=""); -00484 -00485 -00486 -00487 /* Communication to server */ -00488 -00489 // General purpose functions -00490 -00498 int execCommand(string cmd, string answer); -00499 -00506 int setDetectorType(detectorType type=GET_DETECTOR_TYPE); -00507 -00514 int setDetectorType(string type); -00515 -00521 void getDetectorType(char *type); -00522 -00523 -00524 // Detector configuration functions -00531 int setNumberOfModules(int n, dimension d=X); // if n=GET_FLAG returns the number of installed modules -00532 -00533 /* -00534 returns the instrinsic size of the detector (maxmodx, maxmody, nchans, nchips, ndacs -00535 enum numberOf { -00536 MAXMODX, -00537 MAXMODY, -00538 CHANNELS, -00539 CHIPS, -00540 DACS -00541 } -00542 */ -00543 -00544 -00550 int getMaxNumberOfModules(dimension d=X); // -00551 -00552 -00559 externalSignalFlag setExternalSignalFlags(externalSignalFlag pol=GET_EXTERNAL_SIGNAL_FLAG , int signalindex=0); -00560 -00561 -00569 externalCommunicationMode setExternalCommunicationMode(externalCommunicationMode pol=GET_EXTERNAL_COMMUNICATION_MODE); -00570 -00571 -00572 // Tests and identification -00573 -00580 int64_t getId(idMode mode, int imod=0); -00587 int digitalTest(digitalTestMode mode, int imod=0); -00596 int* analogTest(analogTestMode mode); -00597 -00603 int enableAnalogOutput(int ichan); -00604 -00610 int enableAnalogOutput(int imod, int ichip, int ichan); -00611 -00620 int giveCalibrationPulse(float vcal, int npulses); -00621 -00622 // Expert Initialization functions -00623 -00624 -00632 int writeRegister(int addr, int val); -00633 -00640 int readRegister(int addr); +00348 virtual int writeTrimFile(string fname, int imod)=0; +00349 +00354 char* setFilePath(string s) {sprintf(thisDetector->filePath, s.c_str()); return thisDetector->filePath;}; +00355 +00360 char* setFileName(string s) {sprintf(thisDetector->fileName, s.c_str()); return thisDetector->fileName;}; +00361 +00366 int setFileIndex(int i) {thisDetector->fileIndex=i; return thisDetector->fileIndex;}; +00367 +00372 char* getFilePath() {return thisDetector->filePath;}; +00373 +00378 char* getFileName() {return thisDetector->fileName;}; +00379 +00384 int getFileIndex() {return thisDetector->fileIndex;}; +00385 +00397 string createFileName(); +00398 +00413 virtual int writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1)=0; +00414 +00423 virtual int writeDataFile(string fname, int *data)=0; +00424 +00439 virtual int readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0)=0; +00440 +00449 virtual int readDataFile(string fname, int *data)=0; +00450 +00455 char* getCalDir() {cout << "cal dir is " << thisDetector->calDir; return thisDetector->calDir;}; +00456 +00457 +00462 char* setCalDir(string s) {sprintf(thisDetector->calDir, s.c_str()); return thisDetector->calDir;}; +00471 virtual int readCalibrationFile(string fname, float &gain, float &offset)=0; +00480 virtual int writeCalibrationFile(string fname, float gain, float offset)=0; +00481 +00482 +00489 virtual int readAngularConversion(string fname="")=0; +00496 virtual int writeAngularConversion(string fname="")=0; +00497 +00498 +00499 +00500 /* Communication to server */ +00501 +00502 +00510 int execCommand(string cmd, string answer); +00511 +00518 int setDetectorType(detectorType type=GET_DETECTOR_TYPE); +00519 +00526 int setDetectorType(string type); +00527 +00533 void getDetectorType(char *type); +00534 +00535 +00536 // Detector configuration functions +00544 // Detector configuration functions +00551 int setNumberOfModules(int n, dimension d=X); // if n=GET_FLAG returns the number of installed modules +00552 +00553 /* +00554 returns the instrinsic size of the detector (maxmodx, maxmody, nchans, nchips, ndacs +00555 enum numberOf { +00556 MAXMODX, +00557 MAXMODY, +00558 CHANNELS, +00559 CHIPS, +00560 DACS +00561 } +00562 */ +00563 +00564 +00570 int getMaxNumberOfModules(dimension d=X); // +00571 +00572 +00579 externalSignalFlag setExternalSignalFlags(externalSignalFlag pol=GET_EXTERNAL_SIGNAL_FLAG , int signalindex=0); +00580 +00581 +00589 externalCommunicationMode setExternalCommunicationMode(externalCommunicationMode pol=GET_EXTERNAL_COMMUNICATION_MODE); +00590 +00591 +00592 // Tests and identification +00593 +00600 int64_t getId(idMode mode, int imod=0); +00607 int digitalTest(digitalTestMode mode, int imod=0); +00616 int* analogTest(analogTestMode mode); +00617 +00623 int enableAnalogOutput(int ichan); +00624 +00630 int enableAnalogOutput(int imod, int ichip, int ichan); +00631 +00640 int giveCalibrationPulse(float vcal, int npulses); 00641 -00649 float setDAC(float val, dacIndex index, int imod=-1); -00650 -00657 float getADC(dacIndex index, int imod=0); -00658 -00668 int setChannel(int64_t reg, int ichan=-1, int ichip=-1, int imod=-1); -00669 -00675 int setChannel(sls_detector_channel chan); -00676 -00684 sls_detector_channel getChannel(int ichan, int ichip, int imod); -00685 -00686 -00687 -00696 int setChip(int reg, int ichip=-1, int imod=-1); -00697 -00704 int setChip(sls_detector_chip chip); -00705 -00714 sls_detector_chip getChip(int ichip, int imod); -00715 -00716 -00723 int setModule(int reg, int imod=-1); -00724 -00731 int setModule(sls_detector_module module); -00732 -00738 sls_detector_module *getModule(int imod); -00739 -00740 // calibration functions -00741 // int setCalibration(int imod, detectorSettings isettings, float gain, float offset); -00742 //int getCalibration(int imod, detectorSettings isettings, float &gain, float &offset); -00743 +00642 // Expert Initialization functions +00643 +00644 +00652 int writeRegister(int addr, int val); +00653 +00660 int readRegister(int addr); +00661 +00669 float setDAC(float val, dacIndex index, int imod=-1); +00670 +00677 float getADC(dacIndex index, int imod=0); +00678 +00688 int setChannel(int64_t reg, int ichan=-1, int ichip=-1, int imod=-1); +00689 +00695 int setChannel(sls_detector_channel chan); +00696 +00704 sls_detector_channel getChannel(int ichan, int ichip, int imod); +00705 +00706 +00707 +00716 int setChip(int reg, int ichip=-1, int imod=-1); +00717 +00724 int setChip(sls_detector_chip chip); +00725 +00734 sls_detector_chip getChip(int ichip, int imod); +00735 +00736 +00743 int setModule(int reg, int imod=-1); 00744 -00745 /* -00746 calibrated setup of the threshold -00747 */ -00753 int getThresholdEnergy(int imod=-1); -00754 -00762 int setThresholdEnergy(int e_eV, int imod=-1, detectorSettings isettings=GET_SETTINGS); -00763 -00769 detectorSettings getSettings(int imod=-1); -00770 -00779 detectorSettings setSettings(detectorSettings isettings, int imod=-1); -00780 -00781 -00782 // Acquisition functions -00783 -00784 -00789 int startAcquisition(); +00751 int setModule(sls_detector_module module); +00752 +00758 sls_detector_module *getModule(int imod); +00759 +00760 // calibration functions +00761 // int setCalibration(int imod, detectorSettings isettings, float gain, float offset); +00762 //int getCalibration(int imod, detectorSettings isettings, float &gain, float &offset); +00763 +00764 +00765 /* +00766 calibrated setup of the threshold +00767 */ +00773 int getThresholdEnergy(int imod=-1); +00774 +00782 int setThresholdEnergy(int e_eV, int imod=-1, detectorSettings isettings=GET_SETTINGS); +00783 +00789 detectorSettings getSettings(int imod=-1); 00790 -00795 int stopAcquisition(); -00796 -00801 int startReadOut(); -00802 -00807 int getRunStatus(); -00808 -00814 int* startAndReadAll(); -00815 -00820 int startAndReadAllNoWait(); -00821 -00827 int* getDataFromDetectorNoWait(); +00799 detectorSettings setSettings(detectorSettings isettings, int imod=-1); +00800 +00801 +00802 // Acquisition functions +00803 +00804 +00809 int startAcquisition(); +00810 +00815 int stopAcquisition(); +00816 +00821 int startReadOut(); +00822 +00827 int getRunStatus(); 00828 -00834 int* readFrame(); -00835 -00841 int* readAll(); -00842 -00843 -00849 int* popDataQueue(); -00850 -00857 int64_t setTimer(timerIndex index, int64_t t=-1); -00858 -00864 int64_t getTimeLeft(timerIndex index); -00865 -00872 int setClockDivider(int i) {cout << "not implemented any longer!"<< endl; thisDetector->clkDiv=i;return thisDetector->clkDiv;}; -00873 -00880 int getClockDivider() {return thisDetector->clkDiv;}; -00881 -00888 int setSetLength(int i) {cout << "not implemented any longer!"<< endl; thisDetector->clkDiv=i;return 3;}; -00889 -00895 int getSetLength() {return 3;}; -00896 -00897 -00898 // Flags -00906 int setDynamicRange(int n=-1); -00907 -00913 int setROI(int nroi=-1, int *xmin=NULL, int *xmax=NULL, int *ymin=NULL, int *ymax=NULL); -00914 -00915 -00921 int setReadOutFlags(readOutFlags flag); -00922 -00931 int executeTrimming(trimMode mode, int par1, int par2, int imod=-1); -00932 -00933 -00934 //Corrections -00935 -00941 int setFlatFieldCorrection(string fname=""); -00942 -00949 int getFlatFieldCorrections(float *corr=NULL, float *ecorr=NULL); -00950 -00956 int setRateCorrection(float t=0); -00957 -00958 -00964 int getRateCorrections(float &t); -00965 -00970 int getRateCorrections(); -00971 -00977 int setBadChannelCorrection(string fname=""); -00978 -00984 int getBadChannelCorrections(int *bad=NULL); -00985 -00986 -00992 int setAngularConversion(string fname=""); -00993 -01000 int getAngularConversion(int &direction, angleConversionConstant *angconv=NULL); -01001 -01005 float setGlobalOffset(float f){thisDetector->globalOffset=f; return thisDetector->globalOffset;}; -01006 -01010 float setFineOffset(float f){thisDetector->fineOffset=f; return thisDetector->fineOffset;}; -01014 float getFineOffset(){return thisDetector->fineOffset;}; -01015 -01019 float getGlobalOffset(){return thisDetector->globalOffset;}; -01020 -01027 int setPositions(int nPos, float *pos){thisDetector->numberOfPositions=nPos; for (int ip=0; ip<nPos; ip++) thisDetector->detPositions[ip]=pos[ip]; return thisDetector->numberOfPositions;}; -01033 int getPositions(float *pos=NULL){ if (pos ) {for (int ip=0; ip<thisDetector->numberOfPositions; ip++) pos[ip]=thisDetector->detPositions[ip];} return thisDetector->numberOfPositions;}; +00834 int* startAndReadAll(); +00835 +00840 int startAndReadAllNoWait(); +00841 +00847 int* getDataFromDetectorNoWait(); +00848 +00854 int* readFrame(); +00855 +00861 int* readAll(); +00862 +00863 +00869 int* popDataQueue(); +00870 +00877 int64_t setTimer(timerIndex index, int64_t t=-1); +00878 +00884 int64_t getTimeLeft(timerIndex index); +00885 +00886 +00887 +00888 +00895 int setSpeed(speedVariable sp, int value=-1); +00896 +00897 // Flags +00905 int setDynamicRange(int n=-1); +00906 +00912 int setROI(int nroi=-1, int *xmin=NULL, int *xmax=NULL, int *ymin=NULL, int *ymax=NULL); +00913 +00914 +00920 int setReadOutFlags(readOutFlags flag); +00921 +00930 int executeTrimming(trimMode mode, int par1, int par2, int imod=-1); +00931 +00932 +00933 //Corrections +00934 +00940 int setFlatFieldCorrection(string fname=""); +00941 +00948 int getFlatFieldCorrections(float *corr=NULL, float *ecorr=NULL); +00949 +00955 int setRateCorrection(float t=0); +00956 +00957 +00963 int getRateCorrections(float &t); +00964 +00969 int getRateCorrections(); +00970 +00976 int setBadChannelCorrection(string fname=""); +00977 +00983 int getBadChannelCorrections(int *bad=NULL); +00984 +00986 char *getBadChannelCorrectionFile() {return thisDetector->badChanFile;}; +00987 +00988 +00996 virtual int setAngularConversion(string fname="")=0; +00997 +01006 virtual int getAngularConversion(int &direction, angleConversionConstant *angconv=NULL)=0; +01007 +01008 +01013 virtual char *getAngularConversion()=0; +01014 +01020 virtual float setGlobalOffset(float f)=0; +01021 +01027 virtual float setFineOffset(float f)=0; +01033 virtual float getFineOffset()=0; 01034 -01035 -01037 float setBinSize(float bs) {thisDetector->binSize=bs; return thisDetector->binSize;} -01039 float getBinSize() {return thisDetector->binSize;} -01040 +01040 virtual float getGlobalOffset()=0; 01041 -01042 -01043 -01044 -01045 -01051 float* decodeData(int *datain); -01052 -01053 -01054 -01055 -01066 int flatFieldCorrect(float datain, float errin, float &dataout, float &errout, float ffcoefficient, float fferr); -01067 -01076 int flatFieldCorrect(float* datain, float *errin, float* dataout, float *errout); -01077 +01050 virtual int setPositions(int nPos, float *pos)=0; +01058 virtual int getPositions(float *pos=NULL)=0; +01059 +01060 +01067 virtual float setBinSize(float bs)=0; +01068 +01073 virtual float getBinSize()=0; +01074 +01075 +01076 +01077 01078 -01079 -01090 int rateCorrect(float datain, float errin, float &dataout, float &errout, float tau, float t); -01091 -01100 int rateCorrect(float* datain, float *errin, float* dataout, float *errout); -01101 -01102 -01110 int resetMerging(float *mp, float *mv,float *me, int *mm); -01121 int addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv,float *me, int *mm); -01122 -01131 int finalizeMerging(float *mp, float *mv,float *me, int *mm); -01132 -01136 int exitServer(); -01137 -01141 void* processData(); // thread function -01146 sls_detector_module* createModule(); -01152 void deleteModule(sls_detector_module *myMod); -01153 -01154 -01155 void acquire(); -01156 -01157 private: -01158 -01162 sharedSlsDetector *thisDetector; -01163 -01167 int onlineFlag; -01168 -01172 int detId; -01173 -01177 int shmId; -01178 -01182 MySocketTCP *controlSocket; -01183 -01187 MySocketTCP *stopSocket; -01188 -01192 MySocketTCP *dataSocket; -01193 -01197 queue<int*> dataQueue; -01198 -01202 pthread_t dataProcessingThread; -01203 -01207 float currentPosition; -01208 -01212 float currentPositionIndex; -01213 -01217 float currentI0; -01218 -01219 -01220 -01222 float *mergingBins; -01223 -01225 float *mergingCounts; -01226 -01228 float *mergingErrors; +01079 +01085 float* decodeData(int *datain); +01086 +01087 +01088 +01089 +01100 int flatFieldCorrect(float datain, float errin, float &dataout, float &errout, float ffcoefficient, float fferr); +01101 +01110 int flatFieldCorrect(float* datain, float *errin, float* dataout, float *errout); +01111 +01112 +01113 +01124 int rateCorrect(float datain, float errin, float &dataout, float &errout, float tau, float t); +01125 +01134 int rateCorrect(float* datain, float *errin, float* dataout, float *errout); +01135 +01136 +01147 virtual int resetMerging(float *mp, float *mv,float *me, int *mm)=0; +01160 virtual int addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv,float *me, int *mm)=0; +01161 +01171 int finalizeMerging(float *mp, float *mv,float *me, int *mm); +01172 +01176 int exitServer(); +01177 +01182 virtual void* processData()=0; // thread function +01187 sls_detector_module* createModule(); +01193 void deleteModule(sls_detector_module *myMod); +01194 +01195 +01206 virtual void acquire()=0; +01207 +01208 protected: +01209 +01213 sharedSlsDetector *thisDetector; +01214 +01218 int onlineFlag; +01219 +01223 int detId; +01224 +01228 int shmId; 01229 -01231 int *mergingMultiplicity; -01232 -01233 +01233 MySocketTCP *controlSocket; 01234 -01235 -01236 -01237 -01238 -01240 float *ffcoefficients; -01242 float *fferrors; -01244 sls_detector_module *detectorModules; -01246 float *dacs; -01248 float *adcs; -01250 int *chipregs; -01252 int *chanregs; -01254 int *badChannelMask; -01255 -01261 int* getDataFromDetector(); -01262 -01268 int initSharedMemory(detectorType type=GENERIC, int id=0); -01269 -01271 int freeSharedMemory(); -01277 int initializeDetectorSize(detectorType type); -01281 int initializeDetectorStructure(); -01285 int sendChannel(sls_detector_channel*); -01289 int sendChip(sls_detector_chip*); -01293 int sendModule(sls_detector_module*); -01297 int receiveChannel(sls_detector_channel*); -01301 int receiveChip(sls_detector_chip*); -01305 int receiveModule(sls_detector_module*); -01306 -01310 void startThread(); -01311 -01315 int fillBadChannelMask(); -01316 }; -01317 -01318 -01319 //static void* startProcessData(void *n); -01320 #endif -
    Generated on Fri Oct 9 16:01:04 2009 by  +01238 MySocketTCP *stopSocket; +01239 +01243 MySocketTCP *dataSocket; +01244 +01248 queue<int*> dataQueue; +01249 +01253 pthread_t dataProcessingThread; +01254 +01258 float currentPosition; +01259 +01263 float currentPositionIndex; +01264 +01268 float currentI0; +01269 +01270 +01271 +01273 float *mergingBins; +01274 +01276 float *mergingCounts; +01277 +01279 float *mergingErrors; +01280 +01282 int *mergingMultiplicity; +01283 +01284 +01285 +01286 +01287 +01288 +01289 +01291 float *ffcoefficients; +01293 float *fferrors; +01295 sls_detector_module *detectorModules; +01297 float *dacs; +01299 float *adcs; +01301 int *chipregs; +01303 int *chanregs; +01305 int *badChannelMask; +01306 +01312 int* getDataFromDetector(); +01313 +01319 int initSharedMemory(detectorType type=GENERIC, int id=0); +01320 +01322 int freeSharedMemory(); +01328 int initializeDetectorSize(detectorType type); +01332 int initializeDetectorStructure(); +01336 int sendChannel(sls_detector_channel*); +01340 int sendChip(sls_detector_chip*); +01344 int sendModule(sls_detector_module*); +01348 int receiveChannel(sls_detector_channel*); +01352 int receiveChip(sls_detector_chip*); +01356 int receiveModule(sls_detector_module*); +01357 +01361 void startThread(); +01362 +01366 int fillBadChannelMask(); +01367 }; +01368 +01369 +01370 //static void* startProcessData(void *n); +01371 #endif +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/slsDetector_8h.html b/slsDetectorSoftware/docs/html/slsDetector_8h.html index cea35af33..79161fa8e 100644 --- a/slsDetectorSoftware/docs/html/slsDetector_8h.html +++ b/slsDetectorSoftware/docs/html/slsDetector_8h.html @@ -118,7 +118,7 @@

    - +should be changed in order to have it separate for the different detector types

    @@ -271,7 +271,7 @@

    -

    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/sls__detector__defs_8h-source.html b/slsDetectorSoftware/docs/html/sls__detector__defs_8h-source.html index c57b7f8ac..feb88a58a 100644 --- a/slsDetectorSoftware/docs/html/sls__detector__defs_8h-source.html +++ b/slsDetectorSoftware/docs/html/sls__detector__defs_8h-source.html @@ -106,204 +106,212 @@ 00149 00153 enum { 00154 OK, -00155 FAIL -00156 }; -00157 -00161 enum { -00162 DISABLED, -00163 ENABLED -00164 }; -00165 -00169 enum externalSignalFlag { -00170 GET_EXTERNAL_SIGNAL_FLAG, -00171 SIGNAL_OFF, -00172 GATE_IN_ACTIVE_HIGH, -00173 GATE_IN_ACTIVE_LOW, -00174 TRIGGER_IN_RISING_EDGE, -00175 TRIGGER_IN_FALLING_EDGE, -00176 RO_TRIGGER_IN_RISING_EDGE, -00177 RO_TRIGGER_IN_FALLING_EDGE, -00178 GATE_OUT_ACTIVE_HIGH, -00179 GATE_OUT_ACTIVE_LOW, -00180 TRIGGER_OUT_RISING_EDGE, -00181 TRIGGER_OUT_FALLING_EDGE, -00182 RO_TRIGGER_OUT_RISING_EDGE, -00183 RO_TRIGGER_OUT_FALLING_EDGE -00184 }; -00185 -00191 enum externalCommunicationMode{ -00192 GET_EXTERNAL_COMMUNICATION_MODE, -00193 AUTO, -00194 TRIGGER_EXPOSURE, -00195 TRIGGER_READOUT, -00196 TRIGGER_COINCIDENCE_WITH_INTERNAL_ENABLE, -00197 GATE_FIX_NUMBER, -00198 GATE_FIX_DURATION, -00199 GATE_WITH_START_TRIGGER, -00200 GATE_COINCIDENCE_WITH_INTERNAL_ENABLE -00201 }; -00205 enum idMode{ -00206 MODULE_SERIAL_NUMBER, -00207 MODULE_FIRMWARE_VERSION, -00208 DETECTOR_SERIAL_NUMBER, -00209 DETECTOR_FIRMWARE_VERSION, -00210 DETECTOR_SOFTWARE_VERSION, -00211 THIS_SOFTWARE_VERSION -00212 }; -00216 enum digitalTestMode { -00217 CHIP_TEST, -00218 MODULE_FIRMWARE_TEST, -00219 DETECTOR_FIRMWARE_TEST, -00220 DETECTOR_MEMORY_TEST, -00221 DETECTOR_BUS_TEST, -00222 DETECTOR_SOFTWARE_TEST -00223 }; -00227 enum analogTestMode { -00228 CALIBRATION_PULSES, -00229 MY_ANALOG_TEST_MODE -00230 }; -00231 -00235 enum dacIndex { -00236 THRESHOLD, -00237 CALIBRATION_PULSE, -00238 TRIMBIT_SIZE, -00239 PREAMP, -00240 SHAPER1, -00241 SHAPER2, -00242 TEMPERATURE, -00243 HUMIDITY, -00244 DETECTOR_BIAS -00245 }; -00246 -00250 enum detectorSettings{ -00251 GET_SETTINGS=-1, -00252 STANDARD, -00253 FAST, -00254 HIGHGAIN, -00255 UNDEFINED, -00256 UNINITIALIZED -00257 }; -00262 enum channelRegisterBit { -00263 TRIMBIT_OFF, -00264 COMPARATOR_ENABLE=0x100, -00265 ANALOG_SIGNAL_ENABLE=0x200, -00266 CALIBRATION_ENABLE=0x300, -00267 }; -00272 enum chipRegisterBit { -00273 ENABLE_ANALOG_OUTPUT=0x1, -00274 CHIP_OUTPUT_WIDTH=0x2 -00275 }; -00279 enum moduleRegisterBit { -00280 MY_MODULE_REGISTER_BIT, -00281 MODULE_OUTPUT_WIDTH -00282 }; -00283 -00287 enum timerIndex { -00288 FRAME_NUMBER, -00289 ACQUISITION_TIME, -00290 FRAME_PERIOD, -00291 DELAY_AFTER_TRIGGER, -00292 GATES_NUMBER, -00293 PROBES_NUMBER, -00294 CYCLES_NUMBER -00295 }; -00296 -00300 enum readOutFlags { -00301 GET_READOUT_FLAGS=-1, -00302 NORMAL_READOUT=0, -00303 STORE_IN_RAM=0x1, -00304 READ_HITS=0x2, -00305 ZERO_COMPRESSION=0x4, -00306 PUMP_PROBE_MODE=0x8, -00307 BACKGROUND_CORRECTIONS=0x1000 -00308 }; -00312 enum trimMode { -00313 NOISE_TRIMMING, -00314 BEAM_TRIMMING, -00315 IMPROVE_TRIMMING, -00316 FIXEDSETTINGS_TRIMMING, -00317 OFFLINE_TRIMMING +00155 FAIL, +00156 FINISHED +00157 }; +00158 +00162 enum { +00163 DISABLED, +00164 ENABLED +00165 }; +00166 +00170 enum externalSignalFlag { +00171 GET_EXTERNAL_SIGNAL_FLAG, +00172 SIGNAL_OFF, +00173 GATE_IN_ACTIVE_HIGH, +00174 GATE_IN_ACTIVE_LOW, +00175 TRIGGER_IN_RISING_EDGE, +00176 TRIGGER_IN_FALLING_EDGE, +00177 RO_TRIGGER_IN_RISING_EDGE, +00178 RO_TRIGGER_IN_FALLING_EDGE, +00179 GATE_OUT_ACTIVE_HIGH, +00180 GATE_OUT_ACTIVE_LOW, +00181 TRIGGER_OUT_RISING_EDGE, +00182 TRIGGER_OUT_FALLING_EDGE, +00183 RO_TRIGGER_OUT_RISING_EDGE, +00184 RO_TRIGGER_OUT_FALLING_EDGE +00185 }; +00186 +00192 enum externalCommunicationMode{ +00193 GET_EXTERNAL_COMMUNICATION_MODE, +00194 AUTO, +00195 TRIGGER_EXPOSURE, +00196 TRIGGER_READOUT, +00197 TRIGGER_COINCIDENCE_WITH_INTERNAL_ENABLE, +00198 GATE_FIX_NUMBER, +00199 GATE_FIX_DURATION, +00200 GATE_WITH_START_TRIGGER, +00201 GATE_COINCIDENCE_WITH_INTERNAL_ENABLE +00202 }; +00206 enum idMode{ +00207 MODULE_SERIAL_NUMBER, +00208 MODULE_FIRMWARE_VERSION, +00209 DETECTOR_SERIAL_NUMBER, +00210 DETECTOR_FIRMWARE_VERSION, +00211 DETECTOR_SOFTWARE_VERSION, +00212 THIS_SOFTWARE_VERSION +00213 }; +00217 enum digitalTestMode { +00218 CHIP_TEST, +00219 MODULE_FIRMWARE_TEST, +00220 DETECTOR_FIRMWARE_TEST, +00221 DETECTOR_MEMORY_TEST, +00222 DETECTOR_BUS_TEST, +00223 DETECTOR_SOFTWARE_TEST +00224 }; +00228 enum analogTestMode { +00229 CALIBRATION_PULSES, +00230 MY_ANALOG_TEST_MODE +00231 }; +00232 +00236 enum dacIndex { +00237 THRESHOLD, +00238 CALIBRATION_PULSE, +00239 TRIMBIT_SIZE, +00240 PREAMP, +00241 SHAPER1, +00242 SHAPER2, +00243 TEMPERATURE, +00244 HUMIDITY, +00245 DETECTOR_BIAS +00246 }; +00247 +00251 enum detectorSettings{ +00252 GET_SETTINGS=-1, +00253 STANDARD, +00254 FAST, +00255 HIGHGAIN, +00256 UNDEFINED, +00257 UNINITIALIZED +00258 }; +00263 enum channelRegisterBit { +00264 TRIMBIT_OFF, +00265 COMPARATOR_ENABLE=0x100, +00266 ANALOG_SIGNAL_ENABLE=0x200, +00267 CALIBRATION_ENABLE=0x300, +00268 }; +00273 enum chipRegisterBit { +00274 ENABLE_ANALOG_OUTPUT=0x1, +00275 CHIP_OUTPUT_WIDTH=0x2 +00276 }; +00280 enum moduleRegisterBit { +00281 MY_MODULE_REGISTER_BIT, +00282 MODULE_OUTPUT_WIDTH +00283 }; +00284 +00288 enum timerIndex { +00289 FRAME_NUMBER, +00290 ACQUISITION_TIME, +00291 FRAME_PERIOD, +00292 DELAY_AFTER_TRIGGER, +00293 GATES_NUMBER, +00294 PROBES_NUMBER, +00295 CYCLES_NUMBER +00296 }; +00297 +00301 enum speedVariable { +00302 CLOCK_DIVIDER, +00303 WAIT_STATES, +00304 SET_SIGNAL_LENGTH +00305 }; +00306 +00310 enum readOutFlags { +00311 GET_READOUT_FLAGS=-1, +00312 NORMAL_READOUT=0, +00313 STORE_IN_RAM=0x1, +00314 READ_HITS=0x2, +00315 ZERO_COMPRESSION=0x4, +00316 PUMP_PROBE_MODE=0x8, +00317 BACKGROUND_CORRECTIONS=0x1000 00318 }; -00322 enum correctionFlags { -00323 DISCARD_BAD_CHANNELS, -00324 AVERAGE_NEIGHBOURS_FOR_BAD_CHANNELS, -00325 FLAT_FIELD_CORRECTION, -00326 RATE_CORRECTION, -00327 ANGULAR_CONVERSION, -00328 I0_NORMALIZATION -00329 }; -00330 -00339 enum { +00322 enum trimMode { +00323 NOISE_TRIMMING, +00324 BEAM_TRIMMING, +00325 IMPROVE_TRIMMING, +00326 FIXEDSETTINGS_TRIMMING, +00327 OFFLINE_TRIMMING +00328 }; +00332 enum correctionFlags { +00333 DISCARD_BAD_CHANNELS, +00334 AVERAGE_NEIGHBOURS_FOR_BAD_CHANNELS, +00335 FLAT_FIELD_CORRECTION, +00336 RATE_CORRECTION, +00337 ANGULAR_CONVERSION, +00338 I0_NORMALIZATION +00339 }; 00340 -00341 // General purpose functions -00342 F_EXEC_COMMAND, -00343 F_GET_ERROR, -00345 // configuration functions -00346 F_GET_DETECTOR_TYPE, -00347 F_SET_NUMBER_OF_MODULES, -00348 F_GET_MAX_NUMBER_OF_MODULES, -00349 F_SET_EXTERNAL_SIGNAL_FLAG, -00350 F_SET_EXTERNAL_COMMUNICATION_MODE, -00354 // Tests and identification -00355 -00356 F_GET_ID, -00357 F_DIGITAL_TEST, -00358 F_ANALOG_TEST, -00359 F_ENABLE_ANALOG_OUT, -00360 F_CALIBRATION_PULSE, -00362 // Initialization functions -00363 F_SET_DAC, -00364 F_GET_ADC, -00365 F_WRITE_REGISTER, -00366 F_READ_REGISTER, -00367 F_WRITE_MEMORY, -00368 F_READ_MEMORY, -00371 F_SET_CHANNEL, -00372 F_GET_CHANNEL, -00373 F_SET_ALL_CHANNELS, -00375 F_SET_CHIP, -00376 F_GET_CHIP, -00377 F_SET_ALL_CHIPS, -00379 F_SET_MODULE, -00380 F_GET_MODULE, -00381 F_SET_ALL_MODULES, -00384 F_SET_SETTINGS, -00385 F_GET_THRESHOLD_ENERGY, -00386 F_SET_THRESHOLD_ENERGY, -00389 // Acquisition functions -00390 F_START_ACQUISITION, -00391 F_STOP_ACQUISITION, -00392 F_START_READOUT, -00393 F_GET_RUN_STATUS, -00394 F_START_AND_READ_ALL, -00395 F_READ_FRAME, -00396 F_READ_ALL, -00398 //Acquisition setup functions -00399 F_SET_TIMER, -00400 F_GET_TIME_LEFT, -00404 F_SET_DYNAMIC_RANGE, -00405 F_SET_READOUT_FLAGS, -00406 F_SET_ROI, -00408 //Trimming -00409 F_EXECUTE_TRIMMING, -00414 F_EXIT_SERVER -00416 }; -00417 -00418 -00422 typedef struct { -00423 float center; -00424 float ecenter; -00425 float r_conversion; -00426 float er_conversion; -00427 float offset; -00428 float eoffset; -00429 float tilt; -00430 float etilt; -00431 } angleConversionConstant; -00432 -00433 -00434 #endif -
    Generated on Fri Oct 9 16:01:04 2009 by  +00349 enum { +00350 +00351 // General purpose functions +00352 F_EXEC_COMMAND, +00353 F_GET_ERROR, +00355 // configuration functions +00356 F_GET_DETECTOR_TYPE, +00357 F_SET_NUMBER_OF_MODULES, +00358 F_GET_MAX_NUMBER_OF_MODULES, +00359 F_SET_EXTERNAL_SIGNAL_FLAG, +00360 F_SET_EXTERNAL_COMMUNICATION_MODE, +00363 // Tests and identification +00364 +00365 F_GET_ID, +00366 F_DIGITAL_TEST, +00367 F_ANALOG_TEST, +00368 F_ENABLE_ANALOG_OUT, +00369 F_CALIBRATION_PULSE, +00371 // Initialization functions +00372 F_SET_DAC, +00373 F_GET_ADC, +00374 F_WRITE_REGISTER, +00375 F_READ_REGISTER, +00376 F_WRITE_MEMORY, +00377 F_READ_MEMORY, +00380 F_SET_CHANNEL, +00381 F_GET_CHANNEL, +00382 F_SET_ALL_CHANNELS, +00384 F_SET_CHIP, +00385 F_GET_CHIP, +00386 F_SET_ALL_CHIPS, +00388 F_SET_MODULE, +00389 F_GET_MODULE, +00390 F_SET_ALL_MODULES, +00393 F_SET_SETTINGS, +00394 F_GET_THRESHOLD_ENERGY, +00395 F_SET_THRESHOLD_ENERGY, +00398 // Acquisition functions +00399 F_START_ACQUISITION, +00400 F_STOP_ACQUISITION, +00401 F_START_READOUT, +00402 F_GET_RUN_STATUS, +00403 F_START_AND_READ_ALL, +00404 F_READ_FRAME, +00405 F_READ_ALL, +00407 //Acquisition setup functions +00408 F_SET_TIMER, +00409 F_GET_TIME_LEFT, +00413 F_SET_DYNAMIC_RANGE, +00414 F_SET_READOUT_FLAGS, +00415 F_SET_ROI, +00417 F_SET_SPEED, +00419 //Trimming +00420 F_EXECUTE_TRIMMING, +00425 F_EXIT_SERVER +00427 }; +00428 +00429 +00433 typedef struct { +00434 float center; +00435 float ecenter; +00436 float r_conversion; +00437 float er_conversion; +00438 float offset; +00439 float eoffset; +00440 float tilt; +00441 float etilt; +00442 } angleConversionConstant; +00443 +00444 +00445 #endif +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/sls__detector__defs_8h.html b/slsDetectorSoftware/docs/html/sls__detector__defs_8h.html index 0643a45ab..9ea7cef4f 100644 --- a/slsDetectorSoftware/docs/html/sls__detector__defs_8h.html +++ b/slsDetectorSoftware/docs/html/sls__detector__defs_8h.html @@ -77,7 +77,8 @@ } enum  { OK, -FAIL +FAIL, +FINISHED } enum  { DISABLED, @@ -198,6 +199,11 @@
    } +enum  speedVariable { CLOCK_DIVIDER, +WAIT_STATES, +SET_SIGNAL_LENGTH + } + enum  readOutFlags {
      GET_READOUT_FLAGS = -1, NORMAL_READOUT = 0, @@ -284,8 +290,10 @@
      F_SET_READOUT_FLAGS, F_SET_ROI, +F_SET_SPEED, F_EXECUTE_TRIMMING, -F_EXIT_SERVER +
    +  F_EXIT_SERVER
    } @@ -345,6 +353,8 @@ return values
    Enumerator:
    function succeeded FAIL  function failed +FINISHED  +function failed
    @@ -472,6 +482,8 @@ set/get detector dynamic range set/get readout flags F_SET_ROI  set/get region of interest +F_SET_SPEED  +set/get readout speed parameters F_EXECUTE_TRIMMING  execute trimming F_EXIT_SERVER  @@ -973,6 +985,31 @@ background corrections
    • + +

    + +

    +
    + + + + +
    enum speedVariable
    +
    +
    + +

    +important speed parameters

    Enumerator:
    + + + + +
    CLOCK_DIVIDER  +readout clock divider
    WAIT_STATES  +wait states for bus read
    SET_SIGNAL_LENGTH  +set/clear signal length
    +
    +

    @@ -1037,7 +1074,7 @@ trimming is performed offline

    -

    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structROI-members.html b/slsDetectorSoftware/docs/html/structROI-members.html index a86a4c7c0..83b49f43f 100644 --- a/slsDetectorSoftware/docs/html/structROI-members.html +++ b/slsDetectorSoftware/docs/html/structROI-members.html @@ -24,7 +24,7 @@ xminROI ymaxROI yminROI -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structROI.html b/slsDetectorSoftware/docs/html/structROI.html index 398eae7bb..2c4a50573 100644 --- a/slsDetectorSoftware/docs/html/structROI.html +++ b/slsDetectorSoftware/docs/html/structROI.html @@ -100,7 +100,7 @@ is the roi ymin (in channel number)

    The documentation for this struct was generated from the following file: -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structangleConversionConstant-members.html b/slsDetectorSoftware/docs/html/structangleConversionConstant-members.html index 20438c0c6..c761c1ab6 100644 --- a/slsDetectorSoftware/docs/html/structangleConversionConstant-members.html +++ b/slsDetectorSoftware/docs/html/structangleConversionConstant-members.html @@ -28,7 +28,7 @@ offsetangleConversionConstant r_conversionangleConversionConstant tiltangleConversionConstant -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structangleConversionConstant.html b/slsDetectorSoftware/docs/html/structangleConversionConstant.html index 6d900f96c..673889680 100644 --- a/slsDetectorSoftware/docs/html/structangleConversionConstant.html +++ b/slsDetectorSoftware/docs/html/structangleConversionConstant.html @@ -167,7 +167,7 @@ ossible tilt in the orthogonal direction (unused)

    The documentation for this struct was generated from the following file: -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structiarray-members.html b/slsDetectorSoftware/docs/html/structiarray-members.html index e99fa9ad7..34772d766 100644 --- a/slsDetectorSoftware/docs/html/structiarray-members.html +++ b/slsDetectorSoftware/docs/html/structiarray-members.html @@ -22,7 +22,7 @@

    iarray Member List

    This is the complete list of members for iarray, including all inherited members.

    -
    iptriarray
    leniarray

    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structiarray.html b/slsDetectorSoftware/docs/html/structiarray.html index 1d4e187e3..4d1f69c1b 100644 --- a/slsDetectorSoftware/docs/html/structiarray.html +++ b/slsDetectorSoftware/docs/html/structiarray.html @@ -65,7 +65,7 @@ is the number of elements of the array

    The documentation for this struct was generated from the following file: -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structslsDetector_1_1sharedSlsDetector-members.html b/slsDetectorSoftware/docs/html/structslsDetector_1_1sharedSlsDetector-members.html index a0c00972d..21770f1ed 100644 --- a/slsDetectorSoftware/docs/html/structslsDetector_1_1sharedSlsDetector-members.html +++ b/slsDetectorSoftware/docs/html/structslsDetector_1_1sharedSlsDetector-members.html @@ -22,8 +22,10 @@

    slsDetector::sharedSlsDetector Member List

    This is the complete list of members for slsDetector::sharedSlsDetector, including all inherited members.

    + + @@ -70,7 +72,7 @@ -
    adcoffslsDetector::sharedSlsDetector
    alreadyExistingslsDetector::sharedSlsDetector
    angConvFileslsDetector::sharedSlsDetector
    angDirectionslsDetector::sharedSlsDetector
    angOffslsDetector::sharedSlsDetector
    badChanFileslsDetector::sharedSlsDetector
    badChansListslsDetector::sharedSlsDetector
    badFFListslsDetector::sharedSlsDetector
    binSizeslsDetector::sharedSlsDetector
    timerValueslsDetector::sharedSlsDetector
    trimDirslsDetector::sharedSlsDetector
    trimEnergiesslsDetector::sharedSlsDetector

    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structslsDetector_1_1sharedSlsDetector.html b/slsDetectorSoftware/docs/html/structslsDetector_1_1sharedSlsDetector.html index ba35a1c05..7e94b7f4a 100644 --- a/slsDetectorSoftware/docs/html/structslsDetector_1_1sharedSlsDetector.html +++ b/slsDetectorSoftware/docs/html/structslsDetector_1_1sharedSlsDetector.html @@ -81,12 +81,16 @@ int nBadChans +char badChanFile [MAX_STR_LENGTH] + int badChansList [MAX_BADCHANS] int nBadFF int badFFList [MAX_BADCHANS] +char angConvFile [MAX_STR_LENGTH] + angleConversionConstant angOff [MAXMODS] int angDirection @@ -164,6 +168,21 @@ memory offsets for the adc arrays already existing flag. If the detector does not yet exist (alreadyExisting=0) the sharedMemory will be created, otherwise it will simly be linked

    + +

    +
    + + + + +
    char slsDetector::sharedSlsDetector::angConvFile[MAX_STR_LENGTH]
    +
    +
    + +

    +file with the angular conversion factors +

    +

    @@ -193,6 +212,21 @@ angular direction (1 if it corresponds to the encoder direction i.e. channel 0 i

    array of angular conversion constants for each module

    See also:
    angleConversionConstant
    +
    +

    + +

    +
    + + + + +
    char slsDetector::sharedSlsDetector::badChanFile[MAX_STR_LENGTH]
    +
    +
    + +

    +file with the bad channels

    @@ -890,7 +924,7 @@ list of the energies at which the detector has been trimmed (unused)

    The documentation for this struct was generated from the following file: -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structsls__detector__channel-members.html b/slsDetectorSoftware/docs/html/structsls__detector__channel-members.html index bb3c515d6..ecd0697c4 100644 --- a/slsDetectorSoftware/docs/html/structsls__detector__channel-members.html +++ b/slsDetectorSoftware/docs/html/structsls__detector__channel-members.html @@ -24,7 +24,7 @@ chipsls_detector_channel modulesls_detector_channel regsls_detector_channel -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structsls__detector__channel.html b/slsDetectorSoftware/docs/html/structsls__detector__channel.html index 68c0ac27a..2b56d8913 100644 --- a/slsDetectorSoftware/docs/html/structsls__detector__channel.html +++ b/slsDetectorSoftware/docs/html/structsls__detector__channel.html @@ -101,7 +101,7 @@ is the is the channel register (e.g. trimbits, calibration enable, comparator en

    The documentation for this struct was generated from the following file: -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structsls__detector__chip-members.html b/slsDetectorSoftware/docs/html/structsls__detector__chip-members.html index e2e0771a9..f6a54f28d 100644 --- a/slsDetectorSoftware/docs/html/structsls__detector__chip-members.html +++ b/slsDetectorSoftware/docs/html/structsls__detector__chip-members.html @@ -25,7 +25,7 @@ modulesls_detector_chip nchansls_detector_chip regsls_detector_chip -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structsls__detector__chip.html b/slsDetectorSoftware/docs/html/structsls__detector__chip.html index 6726b024c..099a08660 100644 --- a/slsDetectorSoftware/docs/html/structsls__detector__chip.html +++ b/slsDetectorSoftware/docs/html/structsls__detector__chip.html @@ -119,7 +119,7 @@ is the chip register (e.g. output analogue buffer enable)
    See

    The documentation for this struct was generated from the following file: -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structsls__detector__module-members.html b/slsDetectorSoftware/docs/html/structsls__detector__module-members.html index 46e2695a2..0f6d99209 100644 --- a/slsDetectorSoftware/docs/html/structsls__detector__module-members.html +++ b/slsDetectorSoftware/docs/html/structsls__detector__module-members.html @@ -33,7 +33,7 @@ offsetsls_detector_module regsls_detector_module serialnumbersls_detector_module -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/structsls__detector__module.html b/slsDetectorSoftware/docs/html/structsls__detector__module.html index aa62d8f83..8a0e64994 100644 --- a/slsDetectorSoftware/docs/html/structsls__detector__module.html +++ b/slsDetectorSoftware/docs/html/structsls__detector__module.html @@ -266,7 +266,7 @@ is the module serial number

    The documentation for this struct was generated from the following file: -
    Generated on Fri Oct 9 16:01:05 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/usersFunctions_8c.html b/slsDetectorSoftware/docs/html/usersFunctions_8c.html index b1cab6701..ff935cba6 100644 --- a/slsDetectorSoftware/docs/html/usersFunctions_8c.html +++ b/slsDetectorSoftware/docs/html/usersFunctions_8c.html @@ -197,7 +197,7 @@

    -

    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/usersFunctions_8h-source.html b/slsDetectorSoftware/docs/html/usersFunctions_8h-source.html index b94aa5169..2e8ddf18b 100644 --- a/slsDetectorSoftware/docs/html/usersFunctions_8h-source.html +++ b/slsDetectorSoftware/docs/html/usersFunctions_8h-source.html @@ -52,7 +52,7 @@ 00032 00033 00034 #endif -
    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/html/usersFunctions_8h.html b/slsDetectorSoftware/docs/html/usersFunctions_8h.html index 50409056b..0cdc90fe0 100644 --- a/slsDetectorSoftware/docs/html/usersFunctions_8h.html +++ b/slsDetectorSoftware/docs/html/usersFunctions_8h.html @@ -197,7 +197,7 @@

    -

    Generated on Fri Oct 9 16:01:04 2009 by  +
    Generated on Tue Dec 1 10:56:45 2009 by  doxygen 1.4.7
    diff --git a/slsDetectorSoftware/docs/latex/annotated.tex b/slsDetectorSoftware/docs/latex/annotated.tex index 1b7f38c77..5020f593b 100644 --- a/slsDetectorSoftware/docs/latex/annotated.tex +++ b/slsDetectorSoftware/docs/latex/annotated.tex @@ -4,7 +4,7 @@ Here are the classes, structs, unions and interfaces with brief descriptions:\be \item\contentsline{section}{\bf{eiger\-Detector} (This is class contains all eiger specific functionalities )}{\pageref{classeigerDetector}}{} \item\contentsline{section}{\bf{iarray} }{\pageref{structiarray}}{} \item\contentsline{section}{\bf{My\-Socket\-TCP} }{\pageref{classMySocketTCP}}{} -\item\contentsline{section}{\bf{mythen\-Detector} (This calss contains all mythen specific functions )}{\pageref{classmythenDetector}}{} +\item\contentsline{section}{\bf{mythen\-Detector} }{\pageref{classmythenDetector}}{} \item\contentsline{section}{\bf{ROI} }{\pageref{structROI}}{} \item\contentsline{section}{\bf{sls\_\-detector\_\-channel} }{\pageref{structsls__detector__channel}}{} \item\contentsline{section}{\bf{sls\_\-detector\_\-chip} }{\pageref{structsls__detector__chip}}{} diff --git a/slsDetectorSoftware/docs/latex/bug.tex b/slsDetectorSoftware/docs/latex/bug.tex index 33102c1d0..8ec0b4ee5 100644 --- a/slsDetectorSoftware/docs/latex/bug.tex +++ b/slsDetectorSoftware/docs/latex/bug.tex @@ -1,4 +1,4 @@ \section{Bug List}\label{bug} \label{bug__bug000001} \begin{description} -\item[Member \doxyref{sls\-Detector::get\-Chip}{p.}{classslsDetector_6dd6b42b668610dbd03a7700de84b845}(int ichip, int imod) ]probably does not return corretly! \end{description} +\item[Member \doxyref{sls\-Detector::get\-Chip}{p.}{classslsDetector_2eb7f887a72cc80d6b00cadd4731e672}(int ichip, int imod) ]probably does not return corretly! \end{description} diff --git a/slsDetectorSoftware/docs/latex/classeigerDetector.tex b/slsDetectorSoftware/docs/latex/classeigerDetector.tex index 6afa8fc5b..1d4b1eb0a 100644 --- a/slsDetectorSoftware/docs/latex/classeigerDetector.tex +++ b/slsDetectorSoftware/docs/latex/classeigerDetector.tex @@ -90,7 +90,7 @@ decode data from the detector converting them to an array of floats, one for eac Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_937d257464bade6dc6d3ab42c86843ba}.\index{eigerDetector@{eiger\-Detector}!readCalibrationFile@{readCalibrationFile}} \index{readCalibrationFile@{readCalibrationFile}!eigerDetector@{eiger\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::read\-Calibration\-File (string {\em fname}, float \& {\em gain}, float \& {\em offset})}\label{classeigerDetector_6b1b4b5328a5d8c423e9a7a8a950028f} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::read\-Calibration\-File (string {\em fname}, float \& {\em gain}, float \& {\em offset})\hspace{0.3cm}{\tt [virtual]}}\label{classeigerDetector_6b1b4b5328a5d8c423e9a7a8a950028f} int \doxyref{read\-Calibration\-File(string fname, float \&gain, float \&offset)}{p.}{classeigerDetector_6b1b4b5328a5d8c423e9a7a8a950028f}; @@ -104,9 +104,9 @@ int \doxyref{read\-Calibration\-File(string fname, float \&gain, float \&offset) \item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{classslsDetector_2dd6bff7d94ab8005c2797152b19264e} \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_9305060e7499cfcabac23b99c884b92b}.\index{eigerDetector@{eiger\-Detector}!readDataFile@{readDataFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_6c7f837f0820b08f41649c30151cb7ac}.\index{eigerDetector@{eiger\-Detector}!readDataFile@{readDataFile}} \index{readDataFile@{readDataFile}!eigerDetector@{eiger\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::read\-Data\-File (string {\em fname}, int $\ast$ {\em data})}\label{classeigerDetector_a6afa206101506d7f95d1ec835fbf843} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::read\-Data\-File (string {\em fname}, int $\ast$ {\em data})\hspace{0.3cm}{\tt [virtual]}}\label{classeigerDetector_a6afa206101506d7f95d1ec835fbf843} reads a data file \begin{Desc} @@ -118,9 +118,9 @@ reads a data file \begin{Desc} \item[Returns:]OK or FAIL if it could not read the file or data=NULL \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_0d27017bc1140cc9da3e797f03848f2e}.\index{eigerDetector@{eiger\-Detector}!readDataFile@{readDataFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_4239e7a357df82640464c0f2d0a18d69}.\index{eigerDetector@{eiger\-Detector}!readDataFile@{readDataFile}} \index{readDataFile@{readDataFile}!eigerDetector@{eiger\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::read\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt 0})}\label{classeigerDetector_4d0b7da609b9a0457656bfc8cf0a7997} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::read\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt 0})\hspace{0.3cm}{\tt [virtual]}}\label{classeigerDetector_4d0b7da609b9a0457656bfc8cf0a7997} reads a data file \begin{Desc} @@ -132,9 +132,9 @@ reads a data file \begin{Desc} \item[Returns:]OK or FAIL if it could not read the file or data=NULL \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_ffd62fa6a3487693316209ea71502b4b}.\index{eigerDetector@{eiger\-Detector}!readTrimFile@{readTrimFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_86df95809e0e7979eafc04b2b868843d}.\index{eigerDetector@{eiger\-Detector}!readTrimFile@{readTrimFile}} \index{readTrimFile@{readTrimFile}!eigerDetector@{eiger\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\_\-detector\_\-module}$\ast$ eiger\-Detector::read\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} $\ast$ {\em my\-Mod} = {\tt NULL})}\label{classeigerDetector_f24af0459e8eb45c1bc9c68a870e5094} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\_\-detector\_\-module}$\ast$ eiger\-Detector::read\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} $\ast$ {\em my\-Mod} = {\tt NULL})\hspace{0.3cm}{\tt [virtual]}}\label{classeigerDetector_f24af0459e8eb45c1bc9c68a870e5094} reads a trim file \begin{Desc} @@ -147,9 +147,9 @@ reads a trim file \begin{Desc} \item[Returns:]the pointer to my\-Mod or NULL if reading the file failed \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_e84b8a7a2b27db3f89a98f9f8a81efca}.\index{eigerDetector@{eiger\-Detector}!writeCalibrationFile@{writeCalibrationFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_612b52469e27c6675969499d3680abe6}.\index{eigerDetector@{eiger\-Detector}!writeCalibrationFile@{writeCalibrationFile}} \index{writeCalibrationFile@{writeCalibrationFile}!eigerDetector@{eiger\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::write\-Calibration\-File (string {\em fname}, float {\em gain}, float {\em offset})}\label{classeigerDetector_d5fbecfcc46cb151160c6011aa8e33b2} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::write\-Calibration\-File (string {\em fname}, float {\em gain}, float {\em offset})\hspace{0.3cm}{\tt [virtual]}}\label{classeigerDetector_d5fbecfcc46cb151160c6011aa8e33b2} writes a clibration file \begin{Desc} @@ -161,9 +161,9 @@ writes a clibration file \begin{Desc} \item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{classslsDetector_2dd6bff7d94ab8005c2797152b19264e} \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_8eb676a1ab6ef35601ba5cae942ba380}.\index{eigerDetector@{eiger\-Detector}!writeDataFile@{writeDataFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_d12edef440bf2b2f930e83f0ccceb01e}.\index{eigerDetector@{eiger\-Detector}!writeDataFile@{writeDataFile}} \index{writeDataFile@{writeDataFile}!eigerDetector@{eiger\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::write\-Data\-File (string {\em fname}, int $\ast$ {\em data})}\label{classeigerDetector_68a740d5e43fcdb00c57f401666c0856} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::write\-Data\-File (string {\em fname}, int $\ast$ {\em data})\hspace{0.3cm}{\tt [virtual]}}\label{classeigerDetector_68a740d5e43fcdb00c57f401666c0856} writes a data file \begin{Desc} @@ -175,9 +175,9 @@ writes a data file \begin{Desc} \item[Returns:]OK or FAIL if it could not write the file or data=NULL \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_3e1a8e49fbfb34a54381452abc8b5258}.\index{eigerDetector@{eiger\-Detector}!writeDataFile@{writeDataFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_efa98ca652306e2a026c9a5b2fbfe2dc}.\index{eigerDetector@{eiger\-Detector}!writeDataFile@{writeDataFile}} \index{writeDataFile@{writeDataFile}!eigerDetector@{eiger\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::write\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt -1})}\label{classeigerDetector_5ad2bf5b10d17e8c4ad7ae6e81e647e0} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::write\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt -1})\hspace{0.3cm}{\tt [virtual]}}\label{classeigerDetector_5ad2bf5b10d17e8c4ad7ae6e81e647e0} writes a data file \begin{Desc} @@ -189,9 +189,9 @@ writes a data file \begin{Desc} \item[Returns:]OK or FAIL if it could not write the file or data=NULL \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_889c060afb5693830ca2be4fc6a5442c}.\index{eigerDetector@{eiger\-Detector}!writeTrimFile@{writeTrimFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_08823d7078b5e6dd1a4cb7d8b3cfe0af}.\index{eigerDetector@{eiger\-Detector}!writeTrimFile@{writeTrimFile}} \index{writeTrimFile@{writeTrimFile}!eigerDetector@{eiger\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::write\-Trim\-File (string {\em fname}, int {\em imod})}\label{classeigerDetector_df3a0dff0fc3111e10af0363bdd15a6a} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::write\-Trim\-File (string {\em fname}, int {\em imod})\hspace{0.3cm}{\tt [virtual]}}\label{classeigerDetector_df3a0dff0fc3111e10af0363bdd15a6a} writes a trim file for module number imod - the values will be read from the current detector structure \begin{Desc} @@ -205,9 +205,9 @@ writes a trim file for module number imod - the values will be read from the cur \item[See also:]\doxyref{sls\_\-detector\_\-module}{p.}{structsls__detector__module} \doxyref{shared\-Sls\-Detector}{p.}{classslsDetector_2dd6bff7d94ab8005c2797152b19264e} \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_afe675432bf8e5dcb47774da3cc81106}.\index{eigerDetector@{eiger\-Detector}!writeTrimFile@{writeTrimFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_cb27a987551e66093eb201523ac8d8b0}.\index{eigerDetector@{eiger\-Detector}!writeTrimFile@{writeTrimFile}} \index{writeTrimFile@{writeTrimFile}!eigerDetector@{eiger\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::write\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} {\em mod})}\label{classeigerDetector_8380366bf7112021c49be8e6f29f18d8} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int eiger\-Detector::write\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} {\em mod})\hspace{0.3cm}{\tt [virtual]}}\label{classeigerDetector_8380366bf7112021c49be8e6f29f18d8} writes a trim file \begin{Desc} @@ -221,7 +221,7 @@ writes a trim file \begin{Desc} \item[See also:]\doxyref{sls\_\-detector\_\-module}{p.}{structsls__detector__module} \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_9cbb1f97b8e48bd4b108a2dfa992c6af}. +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_5b97351cfaffe067016dbcebbd0778a7}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/slsDetectorSoftware/docs/latex/classmythenDetector.tex b/slsDetectorSoftware/docs/latex/classmythenDetector.tex index 48f8d080e..92a30a722 100644 --- a/slsDetectorSoftware/docs/latex/classmythenDetector.tex +++ b/slsDetectorSoftware/docs/latex/classmythenDetector.tex @@ -1,8 +1,5 @@ \section{mythen\-Detector Class Reference} \label{classmythenDetector}\index{mythenDetector@{mythenDetector}} -This calss contains all mythen specific functions. - - {\tt \#include $<$mythen\-Detector.h$>$} Inheritance diagram for mythen\-Detector::\begin{figure}[H] @@ -14,9 +11,13 @@ Inheritance diagram for mythen\-Detector::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -\bf{mythen\-Detector} (int id=0) +int \bf{read\-Configuration\-File} (string const fname) \item -\bf{$\sim$mythen\-Detector} () +int \bf{write\-Configuration\-File} (string const fname) +\item +int \bf{dump\-Detector\-Setup} (string const fname) +\item +int \bf{retrieve\-Detector\-Setup} (string const fname) \item \bf{sls\_\-detector\_\-module} $\ast$ \bf{read\-Trim\-File} (string fname, \bf{sls\_\-detector\_\-module} $\ast$my\-Mod=NULL) \item @@ -44,6 +45,8 @@ int \bf{set\-Angular\-Conversion} (string fname=\char`\"{}\char`\"{}) \item int \bf{get\-Angular\-Conversion} (int \&direction, \bf{angle\-Conversion\-Constant} $\ast$angconv=NULL) \item +char $\ast$ \bf{get\-Angular\-Conversion} () +\item float \bf{set\-Global\-Offset} (float f) \item float \bf{set\-Fine\-Offset} (float f) @@ -60,77 +63,52 @@ float \bf{set\-Bin\-Size} (float bs) \item float \bf{get\-Bin\-Size} () \item -float $\ast$ \bf{decode\-Data} (int $\ast$datain) -\item int \bf{reset\-Merging} (float $\ast$mp, float $\ast$mv, float $\ast$me, int $\ast$mm) \item int \bf{add\-To\-Merging} (float $\ast$p1, float $\ast$v1, float $\ast$e1, float $\ast$mp, float $\ast$mv, float $\ast$me, int $\ast$mm) \item int \bf{finalize\-Merging} (float $\ast$mp, float $\ast$mv, float $\ast$me, int $\ast$mm) +\item +void $\ast$ \bf{process\-Data} () +\item +void \bf{acquire} () \end{CompactItemize} -\subsection{Detailed Description} -This calss contains all mythen specific functions. - -The \doxyref{mythen\-Detector}{p.}{classmythenDetector} class contains the functions specific to the mythen detector - -\begin{Desc} -\item[Author:]Anna Bergamaschi \end{Desc} -\begin{Desc} -\item[Version:]0.1alpha (any string) \end{Desc} - - - - -\subsection{Constructor \& Destructor Documentation} -\index{mythenDetector@{mythen\-Detector}!mythenDetector@{mythenDetector}} -\index{mythenDetector@{mythenDetector}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mythen\-Detector::mythen\-Detector (int {\em id} = {\tt 0})}\label{classmythenDetector_5efa6a91622e5e173d7491801f60bda0} - - -(default) constructor - -\begin{Desc} -\item[Parameters:] -\begin{description} -\item[{\em id}]is the detector index which is needed to define the shared memory id. Different physical detectors should have different IDs in order to work independently \end{description} -\end{Desc} -\index{mythenDetector@{mythen\-Detector}!~mythenDetector@{$\sim$mythenDetector}} -\index{~mythenDetector@{$\sim$mythenDetector}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mythen\-Detector::$\sim$mythen\-Detector ()\hspace{0.3cm}{\tt [inline]}}\label{classmythenDetector_8118166c2e7c3d3968b9ae5016614693} - - -destructor - \subsection{Member Function Documentation} -\index{mythenDetector@{mythen\-Detector}!addToMerging@{addToMerging}} +\index{mythenDetector@{mythen\-Detector}!acquire@{acquire}} +\index{acquire@{acquire}!mythenDetector@{mythen\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void mythen\-Detector::acquire ()\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_bb3d2f51a414cf9dace29a4b5676828f} + + +performs the complete acquisition and data processing moves the detector to next position \par + starts and reads the detector \par + reads the IC (if required) \par + reads the encoder (iof required for angualr conversion) \par + processes the data (flat field, rate, angular conversion and merging process\-Data()) + +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_d2ee30dfd50f06431dca4e4b9619f301}.\index{mythenDetector@{mythen\-Detector}!addToMerging@{addToMerging}} \index{addToMerging@{addToMerging}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::add\-To\-Merging (float $\ast$ {\em p1}, float $\ast$ {\em v1}, float $\ast$ {\em e1}, float $\ast$ {\em mp}, float $\ast$ {\em mv}, float $\ast$ {\em me}, int $\ast$ {\em mm})}\label{classmythenDetector_eaaf7d7e3150f473e3bbcf59d91692c2} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::add\-To\-Merging (float $\ast$ {\em p1}, float $\ast$ {\em v1}, float $\ast$ {\em e1}, float $\ast$ {\em mp}, float $\ast$ {\em mv}, float $\ast$ {\em me}, int $\ast$ {\em mm})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_eaaf7d7e3150f473e3bbcf59d91692c2} -not yet implemented merge dataset \begin{Desc} +merge dataset \begin{Desc} \item[Parameters:] \begin{description} \item[{\em p1}]angular positions of dataset \item[{\em v1}]data \item[{\em e1}]errors \item[{\em mp}]already merged postions \item[{\em mv}]already merged data \item[{\em me}]already merged errors (squared sum) \item[{\em mm}]multiplicity of merged arrays \end{description} \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_ed3ddadb246080ef644b6d1455fa2e32}.\index{mythenDetector@{mythen\-Detector}!decodeData@{decodeData}} -\index{decodeData@{decodeData}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ mythen\-Detector::decode\-Data (int $\ast$ {\em datain})}\label{classmythenDetector_77e8c92003fab14da768af660509241d} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_feb8730f24292620e5d451cd2d4bb9cd}.\index{mythenDetector@{mythen\-Detector}!dumpDetectorSetup@{dumpDetectorSetup}} +\index{dumpDetectorSetup@{dumpDetectorSetup}!mythenDetector@{mythen\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::dump\-Detector\-Setup (string const {\em fname})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_a0fe9987e8fa240a312ad353ae539188} -decode data from the detector converting them to an array of floats, one for each channle \begin{Desc} -\item[Parameters:] -\begin{description} -\item[{\em datain}]data from the detector \end{description} -\end{Desc} -\begin{Desc} -\item[Returns:]pointer to a float array with a data per channel \end{Desc} +not yet implemented +should dump to a file all the current detector parameters -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_937d257464bade6dc6d3ab42c86843ba}.\index{mythenDetector@{mythen\-Detector}!finalizeMerging@{finalizeMerging}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_96428855d6e286408a52e675e045cf45}.\index{mythenDetector@{mythen\-Detector}!finalizeMerging@{finalizeMerging}} \index{finalizeMerging@{finalizeMerging}!mythenDetector@{mythen\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::finalize\-Merging (float $\ast$ {\em mp}, float $\ast$ {\em mv}, float $\ast$ {\em me}, int $\ast$ {\em mm})}\label{classmythenDetector_a919a42bd89fe21c4086bae5f1fb2f32} @@ -146,7 +124,14 @@ calculates the \char`\"{}final\char`\"{} positions, data value and errors for th Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_8f73479f68ca2171fd2108c2f157299e}.\index{mythenDetector@{mythen\-Detector}!getAngularConversion@{getAngularConversion}} \index{getAngularConversion@{getAngularConversion}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::get\-Angular\-Conversion (int \& {\em direction}, \bf{angle\-Conversion\-Constant} $\ast$ {\em angconv} = {\tt NULL})}\label{classmythenDetector_b2b2f17c36883323ad0abf762c63494f} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}char$\ast$ mythen\-Detector::get\-Angular\-Conversion ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmythenDetector_fab45faa264e44178fc52300eaf92cad} + + +returns the angular conversion file + +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_0c2e502441fd74ec7fc20604c5c08c27}.\index{mythenDetector@{mythen\-Detector}!getAngularConversion@{getAngularConversion}} +\index{getAngularConversion@{getAngularConversion}!mythenDetector@{mythen\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::get\-Angular\-Conversion (int \& {\em direction}, \bf{angle\-Conversion\-Constant} $\ast$ {\em angconv} = {\tt NULL})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_b2b2f17c36883323ad0abf762c63494f} get angular conversion \begin{Desc} @@ -158,30 +143,30 @@ get angular conversion \begin{Desc} \item[Returns:]0 if angular conversion disabled, $>$0 otherwise \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_a146baee5af54b53db0997de02f4779c}.\index{mythenDetector@{mythen\-Detector}!getBinSize@{getBinSize}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_a110e9eb82123756cf89fda0a4cb464d}.\index{mythenDetector@{mythen\-Detector}!getBinSize@{getBinSize}} \index{getBinSize@{getBinSize}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::get\-Bin\-Size ()\hspace{0.3cm}{\tt [inline]}}\label{classmythenDetector_9fd4e479d7eb3f9c53d5d56a43bbccaf} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::get\-Bin\-Size ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmythenDetector_9fd4e479d7eb3f9c53d5d56a43bbccaf} return detector bin size used for merging (approx angular resolution) -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_8a78eda56f5a0c487bbc4e2f962d04db}.\index{mythenDetector@{mythen\-Detector}!getFineOffset@{getFineOffset}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_7d83754e3f41042caa9297da9a33b714}.\index{mythenDetector@{mythen\-Detector}!getFineOffset@{getFineOffset}} \index{getFineOffset@{getFineOffset}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::get\-Fine\-Offset ()\hspace{0.3cm}{\tt [inline]}}\label{classmythenDetector_00720f1445f3f301fa3316828d978de6} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::get\-Fine\-Offset ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmythenDetector_00720f1445f3f301fa3316828d978de6} get detector fine offset -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_1a402a849d04190024e9dc87d4dae6dc}.\index{mythenDetector@{mythen\-Detector}!getGlobalOffset@{getGlobalOffset}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_8e39680a1a096ca13ed672504b5b08e6}.\index{mythenDetector@{mythen\-Detector}!getGlobalOffset@{getGlobalOffset}} \index{getGlobalOffset@{getGlobalOffset}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::get\-Global\-Offset ()\hspace{0.3cm}{\tt [inline]}}\label{classmythenDetector_b2086f336d7198381453556b520dd556} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::get\-Global\-Offset ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmythenDetector_b2086f336d7198381453556b520dd556} get detector global offset -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_42f854256e2900f18b2a17201813b48c}.\index{mythenDetector@{mythen\-Detector}!getPositions@{getPositions}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_8964e3efa73f29b04bd9479578bd1c59}.\index{mythenDetector@{mythen\-Detector}!getPositions@{getPositions}} \index{getPositions@{getPositions}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::get\-Positions (float $\ast$ {\em pos} = {\tt NULL})\hspace{0.3cm}{\tt [inline]}}\label{classmythenDetector_0d306720dced0d3576474978b06b4be4} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::get\-Positions (float $\ast$ {\em pos} = {\tt NULL})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmythenDetector_0d306720dced0d3576474978b06b4be4} get positions for the acquisition \begin{Desc} @@ -193,9 +178,16 @@ get positions for the acquisition \begin{Desc} \item[Returns:]number of positions \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_732f6d36456d6e87d70324a4bdc1bbb8}.\index{mythenDetector@{mythen\-Detector}!readAngularConversion@{readAngularConversion}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_248794801b9794d20e7d58bceab564ab}.\index{mythenDetector@{mythen\-Detector}!processData@{processData}} +\index{processData@{processData}!mythenDetector@{mythen\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ mythen\-Detector::process\-Data ()\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_b5416cb00251f95fc3661936c3cbb1c4} + + +function for processing data + +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_971d316af920fcb3ade98c486fe42c99}.\index{mythenDetector@{mythen\-Detector}!readAngularConversion@{readAngularConversion}} \index{readAngularConversion@{readAngularConversion}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::read\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})}\label{classmythenDetector_33bf1b939eb877bbd4aa42f400d7ca36} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::read\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_33bf1b939eb877bbd4aa42f400d7ca36} reads an angular conversion file \begin{Desc} @@ -207,12 +199,12 @@ reads an angular conversion file \begin{Desc} \item[See also:]\doxyref{angle\-Conversion\-Constant}{p.}{structangleConversionConstant} \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_23398787e01e519bf8ac5f313ca5af01}.\index{mythenDetector@{mythen\-Detector}!readCalibrationFile@{readCalibrationFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_cd9d6358db471600f2e1a143a53c61c1}.\index{mythenDetector@{mythen\-Detector}!readCalibrationFile@{readCalibrationFile}} \index{readCalibrationFile@{readCalibrationFile}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::read\-Calibration\-File (string {\em fname}, float \& {\em gain}, float \& {\em offset})}\label{classmythenDetector_f8f1b7b42012420fc557aacd714140f8} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::read\-Calibration\-File (string {\em fname}, float \& {\em gain}, float \& {\em offset})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_f8f1b7b42012420fc557aacd714140f8} -int \doxyref{read\-Calibration\-File(string fname, float \&gain, float \&offset)}{p.}{classmythenDetector_f8f1b7b42012420fc557aacd714140f8}; \begin{Desc} +reads a calibration file \begin{Desc} \item[Parameters:] \begin{description} \item[{\em fname}]file to be read \item[{\em gain}]reference to the gain variable reference to the offset variable \end{description} @@ -221,9 +213,16 @@ int \doxyref{read\-Calibration\-File(string fname, float \&gain, float \&offset) \item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{classslsDetector_2dd6bff7d94ab8005c2797152b19264e} \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_9305060e7499cfcabac23b99c884b92b}.\index{mythenDetector@{mythen\-Detector}!readDataFile@{readDataFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_6c7f837f0820b08f41649c30151cb7ac}.\index{mythenDetector@{mythen\-Detector}!readConfigurationFile@{readConfigurationFile}} +\index{readConfigurationFile@{readConfigurationFile}!mythenDetector@{mythen\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::read\-Configuration\-File (string const {\em fname})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_92a32bcc57919fcf9eea844905640e90} + + +Purely virtual function Should be implemented in the specific detector class /sa \doxyref{mythen\-Detector::read\-Configuration\-File}{p.}{classmythenDetector_92a32bcc57919fcf9eea844905640e90} + +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_80266f80cfe49c2ccec7118de341d983}.\index{mythenDetector@{mythen\-Detector}!readDataFile@{readDataFile}} \index{readDataFile@{readDataFile}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::read\-Data\-File (string {\em fname}, int $\ast$ {\em data})}\label{classmythenDetector_d83819d61ea01148cf18cd3c46f2a9f7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::read\-Data\-File (string {\em fname}, int $\ast$ {\em data})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_d83819d61ea01148cf18cd3c46f2a9f7} reads a data file \begin{Desc} @@ -235,9 +234,9 @@ reads a data file \begin{Desc} \item[Returns:]OK or FAIL if it could not read the file or data=NULL \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_0d27017bc1140cc9da3e797f03848f2e}.\index{mythenDetector@{mythen\-Detector}!readDataFile@{readDataFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_4239e7a357df82640464c0f2d0a18d69}.\index{mythenDetector@{mythen\-Detector}!readDataFile@{readDataFile}} \index{readDataFile@{readDataFile}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::read\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt 0})}\label{classmythenDetector_1937a5355eed0dc553cb05d2098f7c47} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::read\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt 0})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_1937a5355eed0dc553cb05d2098f7c47} reads a data file \begin{Desc} @@ -249,9 +248,9 @@ reads a data file \begin{Desc} \item[Returns:]OK or FAIL if it could not read the file or data=NULL \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_ffd62fa6a3487693316209ea71502b4b}.\index{mythenDetector@{mythen\-Detector}!readTrimFile@{readTrimFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_86df95809e0e7979eafc04b2b868843d}.\index{mythenDetector@{mythen\-Detector}!readTrimFile@{readTrimFile}} \index{readTrimFile@{readTrimFile}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\_\-detector\_\-module}$\ast$ mythen\-Detector::read\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} $\ast$ {\em my\-Mod} = {\tt NULL})}\label{classmythenDetector_2120f9105997fd8f8bf9165dbffc55e7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\_\-detector\_\-module}$\ast$ mythen\-Detector::read\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} $\ast$ {\em my\-Mod} = {\tt NULL})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_2120f9105997fd8f8bf9165dbffc55e7} reads a trim file \begin{Desc} @@ -264,9 +263,9 @@ reads a trim file \begin{Desc} \item[Returns:]the pointer to my\-Mod or NULL if reading the file failed \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_e84b8a7a2b27db3f89a98f9f8a81efca}.\index{mythenDetector@{mythen\-Detector}!resetMerging@{resetMerging}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_612b52469e27c6675969499d3680abe6}.\index{mythenDetector@{mythen\-Detector}!resetMerging@{resetMerging}} \index{resetMerging@{resetMerging}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::reset\-Merging (float $\ast$ {\em mp}, float $\ast$ {\em mv}, float $\ast$ {\em me}, int $\ast$ {\em mm})}\label{classmythenDetector_7d38c9af0d94bc15571c3c15b38f39a8} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::reset\-Merging (float $\ast$ {\em mp}, float $\ast$ {\em mv}, float $\ast$ {\em me}, int $\ast$ {\em mm})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_7d38c9af0d94bc15571c3c15b38f39a8} sets the arrays of the merged data to 0. NB The array should be created with size $>$= 360./get\-Bin\-Size(); \begin{Desc} @@ -278,9 +277,18 @@ sets the arrays of the merged data to 0. NB The array should be created with siz \item[Returns:]OK or FAIL \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_208c3a5a80ba931056f1f2ff3cb5d0e5}.\index{mythenDetector@{mythen\-Detector}!setAngularConversion@{setAngularConversion}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_20156c620f868445e454bc4115871822}.\index{mythenDetector@{mythen\-Detector}!retrieveDetectorSetup@{retrieveDetectorSetup}} +\index{retrieveDetectorSetup@{retrieveDetectorSetup}!mythenDetector@{mythen\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::retrieve\-Detector\-Setup (string const {\em fname})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_8eedcd0b6739dd878559de5b675fae83} + + +not yet implemented + +should retrieve from a file all the current detector parameters + +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_0ec6aa8998db1bee1b00aeecbe870d5f}.\index{mythenDetector@{mythen\-Detector}!setAngularConversion@{setAngularConversion}} \index{setAngularConversion@{setAngularConversion}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::set\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})}\label{classmythenDetector_78efe554a277de7fb8759307992fc61b} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::set\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_78efe554a277de7fb8759307992fc61b} set angular conversion \begin{Desc} @@ -292,30 +300,30 @@ set angular conversion \begin{Desc} \item[Returns:]0 if angular conversion disabled, $>$0 otherwise \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_30fe39ddd78fa880b6b7815d1d5462ec}.\index{mythenDetector@{mythen\-Detector}!setBinSize@{setBinSize}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_0a17abc301de750f7dafd43b7ad8b0c9}.\index{mythenDetector@{mythen\-Detector}!setBinSize@{setBinSize}} \index{setBinSize@{setBinSize}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::set\-Bin\-Size (float {\em bs})\hspace{0.3cm}{\tt [inline]}}\label{classmythenDetector_8f466447f886379204a59eb6785f1ed0} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::set\-Bin\-Size (float {\em bs})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmythenDetector_8f466447f886379204a59eb6785f1ed0} set detector bin size used for merging (approx angular resolution) -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_96e2fb6fb0aa34bdbe59facf367c4ae1}.\index{mythenDetector@{mythen\-Detector}!setFineOffset@{setFineOffset}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_1a2ebbe67dae42059723071f437eb721}.\index{mythenDetector@{mythen\-Detector}!setFineOffset@{setFineOffset}} \index{setFineOffset@{setFineOffset}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::set\-Fine\-Offset (float {\em f})\hspace{0.3cm}{\tt [inline]}}\label{classmythenDetector_fe142e36f1a5fa8b2ab5fc45e9f8c781} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::set\-Fine\-Offset (float {\em f})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmythenDetector_fe142e36f1a5fa8b2ab5fc45e9f8c781} set detector fine offset -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_fd3b79c59688a7a0f4f72ba5676a2f9b}.\index{mythenDetector@{mythen\-Detector}!setGlobalOffset@{setGlobalOffset}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_7b3b6b3ac5b3b1ee0677f7deeec5c9e3}.\index{mythenDetector@{mythen\-Detector}!setGlobalOffset@{setGlobalOffset}} \index{setGlobalOffset@{setGlobalOffset}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::set\-Global\-Offset (float {\em f})\hspace{0.3cm}{\tt [inline]}}\label{classmythenDetector_e24dd88c4eb965687bd656a12bae8ad7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float mythen\-Detector::set\-Global\-Offset (float {\em f})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmythenDetector_e24dd88c4eb965687bd656a12bae8ad7} set detector global offset -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_84c8dc8017e692d93246cd546e6366c1}.\index{mythenDetector@{mythen\-Detector}!setPositions@{setPositions}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_2a03a8aec6dbf74a606e6960e178fceb}.\index{mythenDetector@{mythen\-Detector}!setPositions@{setPositions}} \index{setPositions@{setPositions}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::set\-Positions (int {\em n\-Pos}, float $\ast$ {\em pos})\hspace{0.3cm}{\tt [inline]}}\label{classmythenDetector_1ffb0963f724e6d6d497685e6de62fd6} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::set\-Positions (int {\em n\-Pos}, float $\ast$ {\em pos})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmythenDetector_1ffb0963f724e6d6d497685e6de62fd6} set positions for the acquisition \begin{Desc} @@ -327,9 +335,9 @@ set positions for the acquisition \begin{Desc} \item[Returns:]number of positions \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_ed6493ad015660281b14814f9a7f6cb5}.\index{mythenDetector@{mythen\-Detector}!writeAngularConversion@{writeAngularConversion}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_961e3976e3077803e2fc245873f81d81}.\index{mythenDetector@{mythen\-Detector}!writeAngularConversion@{writeAngularConversion}} \index{writeAngularConversion@{writeAngularConversion}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})}\label{classmythenDetector_3c5f27709351c49dd715212adc5ba7d2} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_3c5f27709351c49dd715212adc5ba7d2} writes an angular conversion file \begin{Desc} @@ -341,9 +349,9 @@ writes an angular conversion file \begin{Desc} \item[See also:]\doxyref{angle\-Conversion\-Constant}{p.}{structangleConversionConstant} \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_921f212286be085d7e1b8d0d11110d9c}.\index{mythenDetector@{mythen\-Detector}!writeCalibrationFile@{writeCalibrationFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_cace8f0d8706a175915289d86c1fd8d6}.\index{mythenDetector@{mythen\-Detector}!writeCalibrationFile@{writeCalibrationFile}} \index{writeCalibrationFile@{writeCalibrationFile}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Calibration\-File (string {\em fname}, float {\em gain}, float {\em offset})}\label{classmythenDetector_10e7213bb0e7138c07231687e9a6899a} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Calibration\-File (string {\em fname}, float {\em gain}, float {\em offset})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_10e7213bb0e7138c07231687e9a6899a} writes a clibration file \begin{Desc} @@ -355,9 +363,18 @@ writes a clibration file \begin{Desc} \item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{classslsDetector_2dd6bff7d94ab8005c2797152b19264e} \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_8eb676a1ab6ef35601ba5cae942ba380}.\index{mythenDetector@{mythen\-Detector}!writeDataFile@{writeDataFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_d12edef440bf2b2f930e83f0ccceb01e}.\index{mythenDetector@{mythen\-Detector}!writeConfigurationFile@{writeConfigurationFile}} +\index{writeConfigurationFile@{writeConfigurationFile}!mythenDetector@{mythen\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Configuration\-File (string const {\em fname})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_6ad688e0c1a59001ecc61117c67e5434} + + +Every detector should have a basic configuration file containing: type (mythen, pilatus etc.) hostname portnumber communication type (default TCP/IP) eventually secondary portnumber (e.g. mythen stop function) number of modules installed if different from the detector size (x,y) + +to be changed + +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_7801c6d43c72ce5ccaa72743a6f307d2}.\index{mythenDetector@{mythen\-Detector}!writeDataFile@{writeDataFile}} \index{writeDataFile@{writeDataFile}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Data\-File (string {\em fname}, int $\ast$ {\em data})}\label{classmythenDetector_9a49c84d7ad664f7891b00fba0ce829a} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Data\-File (string {\em fname}, int $\ast$ {\em data})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_9a49c84d7ad664f7891b00fba0ce829a} writes a data file \begin{Desc} @@ -369,9 +386,9 @@ writes a data file \begin{Desc} \item[Returns:]OK or FAIL if it could not write the file or data=NULL \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_3e1a8e49fbfb34a54381452abc8b5258}.\index{mythenDetector@{mythen\-Detector}!writeDataFile@{writeDataFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_efa98ca652306e2a026c9a5b2fbfe2dc}.\index{mythenDetector@{mythen\-Detector}!writeDataFile@{writeDataFile}} \index{writeDataFile@{writeDataFile}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt -1})}\label{classmythenDetector_42c1d320f594ebd87e2465cc986ee848} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt -1})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_42c1d320f594ebd87e2465cc986ee848} writes a data file \begin{Desc} @@ -383,9 +400,9 @@ writes a data file \begin{Desc} \item[Returns:]OK or FAIL if it could not write the file or data=NULL \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_889c060afb5693830ca2be4fc6a5442c}.\index{mythenDetector@{mythen\-Detector}!writeTrimFile@{writeTrimFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_08823d7078b5e6dd1a4cb7d8b3cfe0af}.\index{mythenDetector@{mythen\-Detector}!writeTrimFile@{writeTrimFile}} \index{writeTrimFile@{writeTrimFile}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Trim\-File (string {\em fname}, int {\em imod})}\label{classmythenDetector_94179431a737bbceb20f27ca1fd30349} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Trim\-File (string {\em fname}, int {\em imod})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_94179431a737bbceb20f27ca1fd30349} writes a trim file for module number imod - the values will be read from the current detector structure \begin{Desc} @@ -399,9 +416,9 @@ writes a trim file for module number imod - the values will be read from the cur \item[See also:]\doxyref{sls\_\-detector\_\-module}{p.}{structsls__detector__module} \doxyref{shared\-Sls\-Detector}{p.}{classslsDetector_2dd6bff7d94ab8005c2797152b19264e} \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_afe675432bf8e5dcb47774da3cc81106}.\index{mythenDetector@{mythen\-Detector}!writeTrimFile@{writeTrimFile}} +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_cb27a987551e66093eb201523ac8d8b0}.\index{mythenDetector@{mythen\-Detector}!writeTrimFile@{writeTrimFile}} \index{writeTrimFile@{writeTrimFile}!mythenDetector@{mythen\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} {\em mod})}\label{classmythenDetector_0b137abd78bd3d03653cd21436eb6c4d} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int mythen\-Detector::write\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} {\em mod})\hspace{0.3cm}{\tt [virtual]}}\label{classmythenDetector_0b137abd78bd3d03653cd21436eb6c4d} writes a trim file \begin{Desc} @@ -415,7 +432,7 @@ writes a trim file \begin{Desc} \item[See also:]\doxyref{sls\_\-detector\_\-module}{p.}{structsls__detector__module} \end{Desc} -Reimplemented from \bf{sls\-Detector} \doxyref{p.}{classslsDetector_9cbb1f97b8e48bd4b108a2dfa992c6af}. +Implements \bf{sls\-Detector} \doxyref{p.}{classslsDetector_5b97351cfaffe067016dbcebbd0778a7}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/slsDetectorSoftware/docs/latex/classslsDetector.tex b/slsDetectorSoftware/docs/latex/classslsDetector.tex index ccd17b208..3efe90744 100644 --- a/slsDetectorSoftware/docs/latex/classslsDetector.tex +++ b/slsDetectorSoftware/docs/latex/classslsDetector.tex @@ -38,13 +38,13 @@ int \bf{set\-Online} (int const online) \item int \bf{exists} () \item -int \bf{read\-Configuration\-File} (string const fname) +virtual int \bf{read\-Configuration\-File} (string const fname)=0 \item -int \bf{write\-Configuration\-File} (string const fname) +virtual int \bf{write\-Configuration\-File} (string const fname)=0 \item -int \bf{dump\-Detector\-Setup} (string const fname) +virtual int \bf{dump\-Detector\-Setup} (string const fname)=0 \item -int \bf{retrieve\-Detector\-Setup} (string const fname) +virtual int \bf{retrieve\-Detector\-Setup} (string const fname)=0 \item int \bf{set\-TCPSocket} (string const name=\char`\"{}\char`\"{}, int const control\_\-port=-1, int const stop\_\-port=-1, int const data\_\-port=-1) \item @@ -60,13 +60,13 @@ char $\ast$ \bf{get\-Trim\-Dir} () \item char $\ast$ \bf{set\-Trim\-Dir} (string s) \item -int \bf{get\-Trim\-En} (int $\ast$en) +int \bf{get\-Trim\-En} (int $\ast$en=NULL) \item -\bf{sls\_\-detector\_\-module} $\ast$ \bf{read\-Trim\-File} (string fname, \bf{sls\_\-detector\_\-module} $\ast$my\-Mod=NULL) +virtual \bf{sls\_\-detector\_\-module} $\ast$ \bf{read\-Trim\-File} (string fname, \bf{sls\_\-detector\_\-module} $\ast$my\-Mod=NULL)=0 \item -int \bf{write\-Trim\-File} (string fname, \bf{sls\_\-detector\_\-module} mod) +virtual int \bf{write\-Trim\-File} (string fname, \bf{sls\_\-detector\_\-module} mod)=0 \item -int \bf{write\-Trim\-File} (string fname, int imod) +virtual int \bf{write\-Trim\-File} (string fname, int imod)=0 \item char $\ast$ \bf{set\-File\-Path} (string s) \item @@ -82,25 +82,25 @@ int \bf{get\-File\-Index} () \item string \bf{create\-File\-Name} () \item -int \bf{write\-Data\-File} (string fname, float $\ast$data, float $\ast$err=NULL, float $\ast$ang=NULL, char dataformat='f', int nch=-1) +virtual int \bf{write\-Data\-File} (string fname, float $\ast$data, float $\ast$err=NULL, float $\ast$ang=NULL, char dataformat='f', int nch=-1)=0 \item -int \bf{write\-Data\-File} (string fname, int $\ast$data) +virtual int \bf{write\-Data\-File} (string fname, int $\ast$data)=0 \item -int \bf{read\-Data\-File} (string fname, float $\ast$data, float $\ast$err=NULL, float $\ast$ang=NULL, char dataformat='f', int nch=0) +virtual int \bf{read\-Data\-File} (string fname, float $\ast$data, float $\ast$err=NULL, float $\ast$ang=NULL, char dataformat='f', int nch=0)=0 \item -int \bf{read\-Data\-File} (string fname, int $\ast$data) +virtual int \bf{read\-Data\-File} (string fname, int $\ast$data)=0 \item char $\ast$ \bf{get\-Cal\-Dir} () \item char $\ast$ \bf{set\-Cal\-Dir} (string s) \item -int \bf{read\-Calibration\-File} (string fname, float \&gain, float \&offset) +virtual int \bf{read\-Calibration\-File} (string fname, float \&gain, float \&offset)=0 \item -int \bf{write\-Calibration\-File} (string fname, float gain, float offset) +virtual int \bf{write\-Calibration\-File} (string fname, float gain, float offset)=0 \item -int \bf{read\-Angular\-Conversion} (string fname=\char`\"{}\char`\"{}) +virtual int \bf{read\-Angular\-Conversion} (string fname=\char`\"{}\char`\"{})=0 \item -int \bf{write\-Angular\-Conversion} (string fname=\char`\"{}\char`\"{}) +virtual int \bf{write\-Angular\-Conversion} (string fname=\char`\"{}\char`\"{})=0 \item int \bf{exec\-Command} (string cmd, string answer) \item @@ -188,13 +188,7 @@ int64\_\-t \bf{set\-Timer} (\bf{timer\-Index} index, int64\_\-t t=-1) \item int64\_\-t \bf{get\-Time\-Left} (\bf{timer\-Index} index) \item -int \bf{set\-Clock\-Divider} (int i) -\item -int \bf{get\-Clock\-Divider} () -\item -int \bf{set\-Set\-Length} (int i) -\item -int \bf{get\-Set\-Length} () +int \bf{set\-Speed} (\bf{speed\-Variable} sp, int value=-1) \item int \bf{set\-Dynamic\-Range} (int n=-1) \item @@ -218,25 +212,29 @@ int \bf{set\-Bad\-Channel\-Correction} (string fname=\char`\"{}\char`\"{}) \item int \bf{get\-Bad\-Channel\-Corrections} (int $\ast$bad=NULL) \item -int \bf{set\-Angular\-Conversion} (string fname=\char`\"{}\char`\"{}) +char $\ast$ \bf{get\-Bad\-Channel\-Correction\-File} () \item -int \bf{get\-Angular\-Conversion} (int \&direction, \bf{angle\-Conversion\-Constant} $\ast$angconv=NULL) +virtual int \bf{set\-Angular\-Conversion} (string fname=\char`\"{}\char`\"{})=0 \item -float \bf{set\-Global\-Offset} (float f) +virtual int \bf{get\-Angular\-Conversion} (int \&direction, \bf{angle\-Conversion\-Constant} $\ast$angconv=NULL)=0 \item -float \bf{set\-Fine\-Offset} (float f) +virtual char $\ast$ \bf{get\-Angular\-Conversion} ()=0 \item -float \bf{get\-Fine\-Offset} () +virtual float \bf{set\-Global\-Offset} (float f)=0 \item -float \bf{get\-Global\-Offset} () +virtual float \bf{set\-Fine\-Offset} (float f)=0 \item -int \bf{set\-Positions} (int n\-Pos, float $\ast$\bf{pos}) +virtual float \bf{get\-Fine\-Offset} ()=0 \item -int \bf{get\-Positions} (float $\ast$\bf{pos}=NULL) +virtual float \bf{get\-Global\-Offset} ()=0 \item -float \bf{set\-Bin\-Size} (float bs) +virtual int \bf{set\-Positions} (int n\-Pos, float $\ast$\bf{pos})=0 \item -float \bf{get\-Bin\-Size} () +virtual int \bf{get\-Positions} (float $\ast$\bf{pos}=NULL)=0 +\item +virtual float \bf{set\-Bin\-Size} (float bs)=0 +\item +virtual float \bf{get\-Bin\-Size} ()=0 \item float $\ast$ \bf{decode\-Data} (int $\ast$datain) \item @@ -248,23 +246,23 @@ int \bf{rate\-Correct} (float datain, float errin, float \&dataout, float \&erro \item int \bf{rate\-Correct} (float $\ast$datain, float $\ast$errin, float $\ast$dataout, float $\ast$errout) \item -int \bf{reset\-Merging} (float $\ast$mp, float $\ast$mv, float $\ast$me, int $\ast$mm) +virtual int \bf{reset\-Merging} (float $\ast$mp, float $\ast$mv, float $\ast$me, int $\ast$mm)=0 \item -int \bf{add\-To\-Merging} (float $\ast$p1, float $\ast$v1, float $\ast$e1, float $\ast$mp, float $\ast$mv, float $\ast$me, int $\ast$mm) +virtual int \bf{add\-To\-Merging} (float $\ast$p1, float $\ast$v1, float $\ast$e1, float $\ast$mp, float $\ast$mv, float $\ast$me, int $\ast$mm)=0 \item int \bf{finalize\-Merging} (float $\ast$mp, float $\ast$mv, float $\ast$me, int $\ast$mm) \item int \bf{exit\-Server} () \item -void $\ast$ \bf{process\-Data} () +virtual void $\ast$ \bf{process\-Data} ()=0 \item \bf{sls\_\-detector\_\-module} $\ast$ \bf{create\-Module} () \item void \bf{delete\-Module} (\bf{sls\_\-detector\_\-module} $\ast$my\-Mod) \item -void \bf{acquire} () +virtual void \bf{acquire} ()=0 \end{CompactItemize} -\subsection*{Private Member Functions} +\subsection*{Protected Member Functions} \begin{CompactItemize} \item int $\ast$ \bf{get\-Data\-From\-Detector} () @@ -293,7 +291,7 @@ void \bf{start\-Thread} () \item int \bf{fill\-Bad\-Channel\-Mask} () \end{CompactItemize} -\subsection*{Private Attributes} +\subsection*{Protected Attributes} \begin{CompactItemize} \item \bf{shared\-Sls\-Detector} $\ast$ \bf{this\-Detector} @@ -359,7 +357,7 @@ The \doxyref{sls\-Detector}{p.}{classslsDetector} class is expected to become th \begin{Desc} \item[Author:]Anna Bergamaschi \end{Desc} \begin{Desc} -\item[Version:]0.1alpha (any string) \end{Desc} +\item[Version:]0.1alpha \end{Desc} @@ -425,22 +423,32 @@ destructor \subsection{Member Function Documentation} \index{slsDetector@{sls\-Detector}!acquire@{acquire}} \index{acquire@{acquire}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void sls\-Detector::acquire ()}\label{classslsDetector_b09a80264ca69e51b2c8379124398410} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual void sls\-Detector::acquire ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_d2ee30dfd50f06431dca4e4b9619f301} -\index{slsDetector@{sls\-Detector}!addToMerging@{addToMerging}} +pure virtual function performs the complete acquisition and data processing moves the detector to next position \par + starts and reads the detector \par + reads the IC (if required) \par + reads the encoder (iof required for angualr conversion) \par + processes the data (flat field, rate, angular conversion and merging process\-Data()) \begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::acquire()}{p.}{classmythenDetector_bb3d2f51a414cf9dace29a4b5676828f} \end{Desc} + + +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_bb3d2f51a414cf9dace29a4b5676828f}.\index{slsDetector@{sls\-Detector}!addToMerging@{addToMerging}} \index{addToMerging@{addToMerging}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::add\-To\-Merging (float $\ast$ {\em p1}, float $\ast$ {\em v1}, float $\ast$ {\em e1}, float $\ast$ {\em mp}, float $\ast$ {\em mv}, float $\ast$ {\em me}, int $\ast$ {\em mm})}\label{classslsDetector_ed3ddadb246080ef644b6d1455fa2e32} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::add\-To\-Merging (float $\ast$ {\em p1}, float $\ast$ {\em v1}, float $\ast$ {\em e1}, float $\ast$ {\em mp}, float $\ast$ {\em mv}, float $\ast$ {\em me}, int $\ast$ {\em mm})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_feb8730f24292620e5d451cd2d4bb9cd} -not yet implemented merge dataset \begin{Desc} +pure virtual function merge dataset \begin{Desc} \item[Parameters:] \begin{description} \item[{\em p1}]angular positions of dataset \item[{\em v1}]data \item[{\em e1}]errors \item[{\em mp}]already merged postions \item[{\em mv}]already merged data \item[{\em me}]already merged errors (squared sum) \item[{\em mm}]multiplicity of merged arrays \end{description} \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::add\-To\-Merging}{p.}{classmythenDetector_eaaf7d7e3150f473e3bbcf59d91692c2} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_eaaf7d7e3150f473e3bbcf59d91692c2}.\index{slsDetector@{sls\-Detector}!analogTest@{analogTest}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_eaaf7d7e3150f473e3bbcf59d91692c2}.\index{slsDetector@{sls\-Detector}!analogTest@{analogTest}} \index{analogTest@{analogTest}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int$\ast$ sls\-Detector::analog\-Test (\bf{analog\-Test\-Mode} {\em mode})}\label{classslsDetector_18f91f8cf70d2d4eef9b3488b90bac51} @@ -465,7 +473,7 @@ in case also appends the position index Filenames will be of the form: filepath/filename(\_\-px)\_\-i where x is the position index and i is the run index \index{slsDetector@{sls\-Detector}!createModule@{createModule}} \index{createModule@{createModule}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}sls\-Detector::sls\_\-detector\_\-module $\ast$ sls\-Detector::create\-Module ()}\label{classslsDetector_15e6fa87a3c57ff1c8e1943ec72ec6ad} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\_\-detector\_\-module} $\ast$ sls\-Detector::create\-Module ()}\label{classslsDetector_b1d4c6c01d1e10fe06bc83329410d4f4} Allocates the memory for a \doxyref{sls\_\-detector\_\-module}{p.}{structsls__detector__module} structure and initializes it \begin{Desc} @@ -484,7 +492,7 @@ decode data from the detector converting them to an array of floats, one for eac \item[Returns:]pointer to a float array with a data per channel \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_77e8c92003fab14da768af660509241d}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_3e0573baf38c37818c7769fb351010b3}.\index{slsDetector@{sls\-Detector}!deleteModule@{deleteModule}} +Reimplemented in \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_3e0573baf38c37818c7769fb351010b3}.\index{slsDetector@{sls\-Detector}!deleteModule@{deleteModule}} \index{deleteModule@{deleteModule}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}void sls\-Detector::delete\-Module (\bf{sls\_\-detector\_\-module} $\ast$ {\em my\-Mod})}\label{classslsDetector_48984c8d058355c5249233165bf0c410} @@ -508,12 +516,12 @@ Digital test of the modules \begin{Desc} \item[Returns:]OK or error mask \end{Desc} \index{slsDetector@{sls\-Detector}!dumpDetectorSetup@{dumpDetectorSetup}} \index{dumpDetectorSetup@{dumpDetectorSetup}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::dump\-Detector\-Setup (string const {\em fname})}\label{classslsDetector_dc4f62e536b4ef6d0d2d178e3bfbec5e} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::dump\-Detector\-Setup (string const {\em fname})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_96428855d6e286408a52e675e045cf45} -not yet implemented +Purely virtual function Should be implemented in the specific detector class /sa \doxyref{mythen\-Detector::dump\-Detector\-Setup}{p.}{classmythenDetector_a0fe9987e8fa240a312ad353ae539188} -should dump to a file all the current detector parameters \index{slsDetector@{sls\-Detector}!enableAnalogOutput@{enableAnalogOutput}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_a0fe9987e8fa240a312ad353ae539188}.\index{slsDetector@{sls\-Detector}!enableAnalogOutput@{enableAnalogOutput}} \index{enableAnalogOutput@{enableAnalogOutput}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::enable\-Analog\-Output (int {\em imod}, int {\em ichip}, int {\em ichan})}\label{classslsDetector_b20fef344ee47114fccb4d1bc8c6e5bd} @@ -563,9 +571,9 @@ sets the online\-Flag \begin{Desc} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::exit\-Server ()}\label{classslsDetector_466e9a65aa0b404c771d70c9f01af8b9} -turns of server \index{slsDetector@{sls\-Detector}!fillBadChannelMask@{fillBadChannelMask}} +turns off server \index{slsDetector@{sls\-Detector}!fillBadChannelMask@{fillBadChannelMask}} \index{fillBadChannelMask@{fillBadChannelMask}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::fill\-Bad\-Channel\-Mask ()\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_6a0ebe013e27c065b2f67158a27f64ac} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::fill\-Bad\-Channel\-Mask ()\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_6a0ebe013e27c065b2f67158a27f64ac} fill bad channel mask (0 if channel is good, 1 if bad) \index{slsDetector@{sls\-Detector}!finalizeMerging@{finalizeMerging}} @@ -573,13 +581,15 @@ fill bad channel mask (0 if channel is good, 1 if bad) \index{slsDetector@{sls\- \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::finalize\-Merging (float $\ast$ {\em mp}, float $\ast$ {\em mv}, float $\ast$ {\em me}, int $\ast$ {\em mm})}\label{classslsDetector_8f73479f68ca2171fd2108c2f157299e} -calculates the \char`\"{}final\char`\"{} positions, data value and errors for the emrged data \begin{Desc} +pure virtual function calculates the \char`\"{}final\char`\"{} positions, data value and errors for the emrged data \begin{Desc} \item[Parameters:] \begin{description} \item[{\em mp}]already merged postions \item[{\em mv}]already merged data \item[{\em me}]already merged errors (squared sum) \item[{\em mm}]multiplicity of merged arrays \end{description} \end{Desc} \begin{Desc} -\item[Returns:]FAIL or the \end{Desc} +\item[Returns:]FAIL or the number of non empty bins (i.e. points belonging to the pattern) \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::finalize\-Merging}{p.}{classmythenDetector_a919a42bd89fe21c4086bae5f1fb2f32} \end{Desc} Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_a919a42bd89fe21c4086bae5f1fb2f32}.\index{slsDetector@{sls\-Detector}!flatFieldCorrect@{flatFieldCorrect}} @@ -608,7 +618,7 @@ flat field correct data \begin{Desc} \item[Returns:]0 \end{Desc} \index{slsDetector@{sls\-Detector}!freeSharedMemory@{freeSharedMemory}} \index{freeSharedMemory@{freeSharedMemory}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::free\-Shared\-Memory ()\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_5de7fb0d82ae2bcc406385373e665c6f} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::free\-Shared\-Memory ()\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_5de7fb0d82ae2bcc406385373e665c6f} Frees the shared memory - should not be used \index{slsDetector@{sls\-Detector}!getADC@{getADC}} @@ -625,19 +635,35 @@ set dacs value \begin{Desc} \item[Returns:]current ADC value \end{Desc} \index{slsDetector@{sls\-Detector}!getAngularConversion@{getAngularConversion}} \index{getAngularConversion@{getAngularConversion}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::get\-Angular\-Conversion (int \& {\em direction}, \bf{angle\-Conversion\-Constant} $\ast$ {\em angconv} = {\tt NULL})}\label{classslsDetector_a146baee5af54b53db0997de02f4779c} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual char$\ast$ sls\-Detector::get\-Angular\-Conversion ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_0c2e502441fd74ec7fc20604c5c08c27} -get angular conversion \begin{Desc} +pure virtual function returns the angular conversion file \begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::get\-Angular\-Conversion}{p.}{classmythenDetector_b2b2f17c36883323ad0abf762c63494f} \end{Desc} + + +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_fab45faa264e44178fc52300eaf92cad}.\index{slsDetector@{sls\-Detector}!getAngularConversion@{getAngularConversion}} +\index{getAngularConversion@{getAngularConversion}!slsDetector@{sls\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::get\-Angular\-Conversion (int \& {\em direction}, \bf{angle\-Conversion\-Constant} $\ast$ {\em angconv} = {\tt NULL})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_a110e9eb82123756cf89fda0a4cb464d} + + +pure virtual function get angular conversion \begin{Desc} \item[Parameters:] \begin{description} \item[{\em reference}]to diffractometer direction \item[{\em angconv}]array that will be filled with the angular conversion constants \end{description} \end{Desc} \begin{Desc} \item[Returns:]0 if angular conversion disabled, $>$0 otherwise \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::get\-Angular\-Conversion}{p.}{classmythenDetector_b2b2f17c36883323ad0abf762c63494f} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_b2b2f17c36883323ad0abf762c63494f}.\index{slsDetector@{sls\-Detector}!getBadChannelCorrections@{getBadChannelCorrections}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_b2b2f17c36883323ad0abf762c63494f}.\index{slsDetector@{sls\-Detector}!getBadChannelCorrectionFile@{getBadChannelCorrectionFile}} +\index{getBadChannelCorrectionFile@{getBadChannelCorrectionFile}!slsDetector@{sls\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}char$\ast$ sls\-Detector::get\-Bad\-Channel\-Correction\-File ()\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_0b562f90b64c80e3eb64e9e2153bb234} + + +returns the bad channel list file \index{slsDetector@{sls\-Detector}!getBadChannelCorrections@{getBadChannelCorrections}} \index{getBadChannelCorrections@{getBadChannelCorrections}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::get\-Bad\-Channel\-Corrections (int $\ast$ {\em bad} = {\tt NULL})}\label{classslsDetector_f80db913b55026bb69d35585b08729cc} @@ -651,12 +677,14 @@ get bad channels correction \begin{Desc} \item[Returns:]0 if bad channel disabled or no bad channels, $>$0 otherwise \end{Desc} \index{slsDetector@{sls\-Detector}!getBinSize@{getBinSize}} \index{getBinSize@{getBinSize}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float sls\-Detector::get\-Bin\-Size ()\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_8a78eda56f5a0c487bbc4e2f962d04db} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual float sls\-Detector::get\-Bin\-Size ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_7d83754e3f41042caa9297da9a33b714} -return detector bin size used for merging (approx angular resolution) +pure virtual function return detector bin size used for merging (approx angular resolution) \begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::get\-Bin\-Size}{p.}{classmythenDetector_9fd4e479d7eb3f9c53d5d56a43bbccaf} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_9fd4e479d7eb3f9c53d5d56a43bbccaf}.\index{slsDetector@{sls\-Detector}!getCalDir@{getCalDir}} + +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_9fd4e479d7eb3f9c53d5d56a43bbccaf}.\index{slsDetector@{sls\-Detector}!getCalDir@{getCalDir}} \index{getCalDir@{getCalDir}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}char$\ast$ sls\-Detector::get\-Cal\-Dir ()\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_102679594e60ed261daff24b4aeac21a} @@ -665,7 +693,7 @@ returns the location of the calibration files \begin{Desc} \item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \end{Desc} \index{slsDetector@{sls\-Detector}!getChannel@{getChannel}} \index{getChannel@{getChannel}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}sls\-Detector::sls\_\-detector\_\-channel sls\-Detector::get\-Channel (int {\em ichan}, int {\em ichip}, int {\em imod})}\label{classslsDetector_bbf8573e249da1f0a436f581d0dc62e4} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\_\-detector\_\-channel} sls\-Detector::get\-Channel (int {\em ichan}, int {\em ichip}, int {\em imod})}\label{classslsDetector_05f1a170b7416db77bf7cff762e9b58a} get channel \begin{Desc} @@ -677,7 +705,7 @@ get channel \begin{Desc} \item[Returns:]current channel structure for channel \end{Desc} \index{slsDetector@{sls\-Detector}!getChip@{getChip}} \index{getChip@{getChip}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}sls\-Detector::sls\_\-detector\_\-chip sls\-Detector::get\-Chip (int {\em ichip}, int {\em imod})}\label{classslsDetector_6dd6b42b668610dbd03a7700de84b845} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\_\-detector\_\-chip} sls\-Detector::get\-Chip (int {\em ichip}, int {\em imod})}\label{classslsDetector_2eb7f887a72cc80d6b00cadd4731e672} get chip \begin{Desc} @@ -689,14 +717,7 @@ get chip \begin{Desc} \item[Returns:]current chip structure for channel\end{Desc} \begin{Desc} \item[\bf{Bug}]probably does not return corretly! \end{Desc} -\index{slsDetector@{sls\-Detector}!getClockDivider@{getClockDivider}} -\index{getClockDivider@{getClockDivider}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::get\-Clock\-Divider ()\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_12b884821edc41fe9821f2ab084a0baf} - - -get clock divider - -not implemented (should be something more general like \char`\"{}set speed including also waitstates, set cycles etc.) \index{slsDetector@{sls\-Detector}!getControlPort@{getControlPort}} +\index{slsDetector@{sls\-Detector}!getControlPort@{getControlPort}} \index{getControlPort@{getControlPort}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::get\-Control\-Port ()\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_40ffd69f1c40b26575954e826cdf606a} @@ -705,7 +726,7 @@ returns the detector control port\begin{Desc} \item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \end{Desc} \index{slsDetector@{sls\-Detector}!getDataFromDetector@{getDataFromDetector}} \index{getDataFromDetector@{getDataFromDetector}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int $\ast$ sls\-Detector::get\-Data\-From\-Detector ()\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_b1982e89f8e8de63c807a707ccba594c} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int $\ast$ sls\-Detector::get\-Data\-From\-Detector ()\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_b1982e89f8e8de63c807a707ccba594c} Receives a data frame from the detector socket \begin{Desc} @@ -759,12 +780,14 @@ returns the default output files path \begin{Desc} \item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \end{Desc} \index{slsDetector@{sls\-Detector}!getFineOffset@{getFineOffset}} \index{getFineOffset@{getFineOffset}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float sls\-Detector::get\-Fine\-Offset ()\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_1a402a849d04190024e9dc87d4dae6dc} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual float sls\-Detector::get\-Fine\-Offset ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_8e39680a1a096ca13ed672504b5b08e6} -get detector fine offset +pure virtual function get detector fine offset \begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::get\-Fine\-Offset}{p.}{classmythenDetector_00720f1445f3f301fa3316828d978de6} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_00720f1445f3f301fa3316828d978de6}.\index{slsDetector@{sls\-Detector}!getFlatFieldCorrections@{getFlatFieldCorrections}} + +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_00720f1445f3f301fa3316828d978de6}.\index{slsDetector@{sls\-Detector}!getFlatFieldCorrections@{getFlatFieldCorrections}} \index{getFlatFieldCorrections@{getFlatFieldCorrections}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::get\-Flat\-Field\-Corrections (float $\ast$ {\em corr} = {\tt NULL}, float $\ast$ {\em ecorr} = {\tt NULL})}\label{classslsDetector_af22c79193907e364c6db97f5e55b9fd} @@ -778,12 +801,14 @@ get flat field corrections \begin{Desc} \item[Returns:]0 if ff correction disabled, $>$0 otherwise \end{Desc} \index{slsDetector@{sls\-Detector}!getGlobalOffset@{getGlobalOffset}} \index{getGlobalOffset@{getGlobalOffset}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float sls\-Detector::get\-Global\-Offset ()\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_42f854256e2900f18b2a17201813b48c} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual float sls\-Detector::get\-Global\-Offset ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_8964e3efa73f29b04bd9479578bd1c59} -get detector global offset +pure virtual function get detector global offset \begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::get\-Global\-Offset}{p.}{classmythenDetector_b2086f336d7198381453556b520dd556} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_b2086f336d7198381453556b520dd556}.\index{slsDetector@{sls\-Detector}!getHostname@{getHostname}} + +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_b2086f336d7198381453556b520dd556}.\index{slsDetector@{sls\-Detector}!getHostname@{getHostname}} \index{getHostname@{getHostname}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}char$\ast$ sls\-Detector::get\-Hostname ()\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_fad06908ad59bfd8a8577899d6aa1843} @@ -816,7 +841,7 @@ get the maximum size of the detector \begin{Desc} \item[Returns:]maximum number of modules that can be installed in direction d \end{Desc} \index{slsDetector@{sls\-Detector}!getModule@{getModule}} \index{getModule@{getModule}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}sls\-Detector::sls\_\-detector\_\-module $\ast$ sls\-Detector::get\-Module (int {\em imod})}\label{classslsDetector_d1b14626e602ceaebfcf4321f6f40997} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\_\-detector\_\-module} $\ast$ sls\-Detector::get\-Module (int {\em imod})}\label{classslsDetector_32557eee02e541840246b4b4a3e76c83} get module \begin{Desc} @@ -828,19 +853,21 @@ get module \begin{Desc} \item[Returns:]pointer to module structure (which has bee created and must then be deleted) \end{Desc} \index{slsDetector@{sls\-Detector}!getPositions@{getPositions}} \index{getPositions@{getPositions}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::get\-Positions (float $\ast$ {\em pos} = {\tt NULL})\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_732f6d36456d6e87d70324a4bdc1bbb8} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::get\-Positions (float $\ast$ {\em pos} = {\tt NULL})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_248794801b9794d20e7d58bceab564ab} -get positions for the acquisition \begin{Desc} +pure virtual function get positions for the acquisition \begin{Desc} \item[Parameters:] \begin{description} \item[{\em pos}]array which will contain the encoder positions \end{description} \end{Desc} \begin{Desc} \item[Returns:]number of positions \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::get\-Positions}{p.}{classmythenDetector_0d306720dced0d3576474978b06b4be4} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_0d306720dced0d3576474978b06b4be4}.\index{slsDetector@{sls\-Detector}!getRateCorrections@{getRateCorrections}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_0d306720dced0d3576474978b06b4be4}.\index{slsDetector@{sls\-Detector}!getRateCorrections@{getRateCorrections}} \index{getRateCorrections@{getRateCorrections}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::get\-Rate\-Corrections ()}\label{classslsDetector_7606366a3cbe280c90dc659036814697} @@ -866,16 +893,9 @@ get rate correction \begin{Desc} get run status \begin{Desc} \item[Returns:]status mask \end{Desc} -\index{slsDetector@{sls\-Detector}!getSetLength@{getSetLength}} -\index{getSetLength@{getSetLength}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::get\-Set\-Length ()\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_51a88168bf9e4cd2ef7730b973963055} - - -get length cycles - -not implemented (should be something more general like \char`\"{}set speed including also waitstates, set cycles etc.) \index{slsDetector@{sls\-Detector}!getSettings@{getSettings}} +\index{slsDetector@{sls\-Detector}!getSettings@{getSettings}} \index{getSettings@{getSettings}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\-Detector::detector\-Settings} sls\-Detector::get\-Settings (int {\em imod} = {\tt -1})}\label{classslsDetector_d112702360f31a967bfad9fe2aabf6f6} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{detector\-Settings} sls\-Detector::get\-Settings (int {\em imod} = {\tt -1})}\label{classslsDetector_cfccfada625943feb410c6a14607a366} get detector settings \begin{Desc} @@ -925,7 +945,7 @@ returns the detector trimbit directory\begin{Desc} \item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \end{Desc} \index{slsDetector@{sls\-Detector}!getTrimEn@{getTrimEn}} \index{getTrimEn@{getTrimEn}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::get\-Trim\-En (int $\ast$ {\em en})\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_fa24d8a0ec1393c7e27e4e558e72cf87} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::get\-Trim\-En (int $\ast$ {\em en} = {\tt NULL})\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_8862569a4a2530558914daa2e2251138} returns the number of trim energies and their value\begin{Desc} @@ -951,7 +971,7 @@ give a train of calibration pulses \begin{Desc} \end{Desc} not yet implemented \index{slsDetector@{sls\-Detector}!initializeDetectorSize@{initializeDetectorSize}} \index{initializeDetectorSize@{initializeDetectorSize}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::initialize\-Detector\-Size (\bf{detector\-Type} {\em type})\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_19f1c6d120293c98a0d2dc992e5616f8} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::initialize\-Detector\-Size (\bf{detector\-Type} {\em type})\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_19f1c6d120293c98a0d2dc992e5616f8} Initializes the this\-Detector structure \begin{Desc} @@ -987,6 +1007,8 @@ set correction mask to 0 set deat time +sets bad channel list file to none + set number of bad chans to 0 set number of bad flat field chans to 0 @@ -1009,6 +1031,8 @@ set clockdivider to 1 set number of positions to 0 +sets angular conversion file to none + set binsize calculates the memory offsets for flat field coefficients and errors, module structures, dacs, adcs, chips and channels @@ -1023,7 +1047,7 @@ fill the Bad\-Channel\-Mask \begin{Desc} \item[See also:]\doxyref{fill\-Bad\-Channel\-Mask}{p.}{classslsDetector_6a0ebe013e27c065b2f67158a27f64ac} \end{Desc} \index{slsDetector@{sls\-Detector}!initializeDetectorStructure@{initializeDetectorStructure}} \index{initializeDetectorStructure@{initializeDetectorStructure}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::initialize\-Detector\-Structure ()\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_1c39e47efe5d8794b68cb32295cddf3c} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::initialize\-Detector\-Structure ()\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_1c39e47efe5d8794b68cb32295cddf3c} Initializes the module structures in this\-Detector if the detector did not exists before @@ -1044,7 +1068,7 @@ initializes the channel registers to 0 initialize gain and offset to -1 \index{slsDetector@{sls\-Detector}!initSharedMemory@{initSharedMemory}} \index{initSharedMemory@{initSharedMemory}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::init\-Shared\-Memory (\bf{detector\-Type} {\em type} = {\tt GENERIC}, int {\em id} = {\tt 0})\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_cb94b9bfa7bbea2d9e1b0289a272bca8} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::init\-Shared\-Memory (\bf{detector\-Type} {\em type} = {\tt GENERIC}, int {\em id} = {\tt 0})\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_cb94b9bfa7bbea2d9e1b0289a272bca8} Initializes the shared memory \begin{Desc} @@ -1073,26 +1097,14 @@ pops the data from the data queue \begin{Desc} \item[See also:]\doxyref{data\-Queue}{p.}{classslsDetector_52e9fe9baf37db001cdf58f982ab5dd6} \end{Desc} \index{slsDetector@{sls\-Detector}!processData@{processData}} \index{processData@{processData}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void $\ast$ sls\-Detector::process\-Data ()}\label{classslsDetector_717eb12630b1d1f5138f98e5f7ba021f} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual void$\ast$ sls\-Detector::process\-Data ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_971d316af920fcb3ade98c486fe42c99} -function for processing data +pure virtual function function for processing data \begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::process\-Data}{p.}{classmythenDetector_b5416cb00251f95fc3661936c3cbb1c4} \end{Desc} -Pop data queue -decode data - -write raw data file - -rate correction - -flat field correction - -angular conversion - -data merging - -file writing \index{slsDetector@{sls\-Detector}!rateCorrect@{rateCorrect}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_b5416cb00251f95fc3661936c3cbb1c4}.\index{slsDetector@{sls\-Detector}!rateCorrect@{rateCorrect}} \index{rateCorrect@{rateCorrect}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::rate\-Correct (float $\ast$ {\em datain}, float $\ast$ {\em errin}, float $\ast$ {\em dataout}, float $\ast$ {\em errout})}\label{classslsDetector_518feacfa3a1d6156779f8eaacdf86d3} @@ -1127,68 +1139,72 @@ asks and receives all data from the detector and puts them in a data queue \begi \item[See also:]\doxyref{get\-Data\-From\-Detector}{p.}{classslsDetector_b1982e89f8e8de63c807a707ccba594c} \doxyref{data\-Queue}{p.}{classslsDetector_52e9fe9baf37db001cdf58f982ab5dd6} \end{Desc} \index{slsDetector@{sls\-Detector}!readAngularConversion@{readAngularConversion}} \index{readAngularConversion@{readAngularConversion}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::read\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})}\label{classslsDetector_23398787e01e519bf8ac5f313ca5af01} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::read\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_cd9d6358db471600f2e1a143a53c61c1} -reads an angular conversion file \begin{Desc} +Pure virtual function reads an angular conversion file \begin{Desc} \item[Parameters:] \begin{description} \item[{\em fname}]file to be read \end{description} \end{Desc} \begin{Desc} -\item[See also:]\doxyref{angle\-Conversion\-Constant}{p.}{structangleConversionConstant} \end{Desc} +\item[See also:]\doxyref{angle\-Conversion\-Constant}{p.}{structangleConversionConstant} \doxyref{mythen\-Detector::read\-Angular\-Conversion}{p.}{classmythenDetector_33bf1b939eb877bbd4aa42f400d7ca36} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_33bf1b939eb877bbd4aa42f400d7ca36}.\index{slsDetector@{sls\-Detector}!readCalibrationFile@{readCalibrationFile}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_33bf1b939eb877bbd4aa42f400d7ca36}.\index{slsDetector@{sls\-Detector}!readCalibrationFile@{readCalibrationFile}} \index{readCalibrationFile@{readCalibrationFile}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::read\-Calibration\-File (string {\em fname}, float \& {\em gain}, float \& {\em offset})}\label{classslsDetector_9305060e7499cfcabac23b99c884b92b} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::read\-Calibration\-File (string {\em fname}, float \& {\em gain}, float \& {\em offset})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_6c7f837f0820b08f41649c30151cb7ac} -reads a calibration file \begin{Desc} +Pure virtual function reads a calibration file \begin{Desc} \item[Parameters:] \begin{description} \item[{\em fname}]file to be read \item[{\em gain}]reference to the gain variable reference to the offset variable \end{description} \end{Desc} \begin{Desc} -\item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \end{Desc} +\item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \doxyref{mythen\-Detector::read\-Calibration\-File}{p.}{classmythenDetector_f8f1b7b42012420fc557aacd714140f8} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_f8f1b7b42012420fc557aacd714140f8}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_6b1b4b5328a5d8c423e9a7a8a950028f}.\index{slsDetector@{sls\-Detector}!readConfigurationFile@{readConfigurationFile}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_f8f1b7b42012420fc557aacd714140f8}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_6b1b4b5328a5d8c423e9a7a8a950028f}.\index{slsDetector@{sls\-Detector}!readConfigurationFile@{readConfigurationFile}} \index{readConfigurationFile@{readConfigurationFile}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::read\-Configuration\-File (string const {\em fname})}\label{classslsDetector_49c88825b21dc040269f6980e9725a3a} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::read\-Configuration\-File (string const {\em fname})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_80266f80cfe49c2ccec7118de341d983} -Every detector should have a basic configuration file containing: type (mythen, pilatus etc.) hostname portnumber communication type (default TCP/IP) eventually secondary portnumber (e.g. mythen stop function) number of modules installed if different from the detector size (x,y) +Purely virtual function Should be implemented in the specific detector class /sa \doxyref{mythen\-Detector::read\-Configuration\-File}{p.}{classmythenDetector_92a32bcc57919fcf9eea844905640e90} -to be changed \index{slsDetector@{sls\-Detector}!readDataFile@{readDataFile}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_92a32bcc57919fcf9eea844905640e90}.\index{slsDetector@{sls\-Detector}!readDataFile@{readDataFile}} \index{readDataFile@{readDataFile}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::read\-Data\-File (string {\em fname}, int $\ast$ {\em data})}\label{classslsDetector_0d27017bc1140cc9da3e797f03848f2e} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::read\-Data\-File (string {\em fname}, int $\ast$ {\em data})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_4239e7a357df82640464c0f2d0a18d69} -reads a data file \begin{Desc} +Pure virtual function reads a data file \begin{Desc} \item[Parameters:] \begin{description} \item[{\em name}]of the file to be read \item[{\em data}]array of data values \end{description} \end{Desc} \begin{Desc} \item[Returns:]OK or FAIL if it could not read the file or data=NULL \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::read\-Data\-File}{p.}{classmythenDetector_1937a5355eed0dc553cb05d2098f7c47} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_d83819d61ea01148cf18cd3c46f2a9f7}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_a6afa206101506d7f95d1ec835fbf843}.\index{slsDetector@{sls\-Detector}!readDataFile@{readDataFile}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_d83819d61ea01148cf18cd3c46f2a9f7}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_a6afa206101506d7f95d1ec835fbf843}.\index{slsDetector@{sls\-Detector}!readDataFile@{readDataFile}} \index{readDataFile@{readDataFile}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::read\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt 0})}\label{classslsDetector_ffd62fa6a3487693316209ea71502b4b} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::read\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt 0})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_86df95809e0e7979eafc04b2b868843d} -reads a data file \begin{Desc} +Pure virtual function reads a data file \begin{Desc} \item[Parameters:] \begin{description} \item[{\em name}]of the file to be read \item[{\em data}]array of data values to be filled \item[{\em err}]array of arrors on the data. If NULL no errors are expected on the file\item[{\em ang}]array of angular values. If NULL data are expected in the form chan-val(-err) otherwise ang-val(-err) \item[{\em dataformat}]format of the data: can be 'i' integer or 'f' float (default) \item[{\em nch}]number of channels to be written to file. if $<$=0 defaults to the number of installed channels of the detector \end{description} \end{Desc} \begin{Desc} -\item[Returns:]OK or FAIL if it could not read the file or data=NULL \end{Desc} +\item[Returns:]OK or FAIL if it could not read the file or data=NULL\end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::read\-Data\-File}{p.}{classmythenDetector_1937a5355eed0dc553cb05d2098f7c47} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_1937a5355eed0dc553cb05d2098f7c47}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_4d0b7da609b9a0457656bfc8cf0a7997}.\index{slsDetector@{sls\-Detector}!readFrame@{readFrame}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_1937a5355eed0dc553cb05d2098f7c47}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_4d0b7da609b9a0457656bfc8cf0a7997}.\index{slsDetector@{sls\-Detector}!readFrame@{readFrame}} \index{readFrame@{readFrame}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int $\ast$ sls\-Detector::read\-Frame ()}\label{classslsDetector_b352d85c5a4f415d1ec930d17bae87fa} @@ -1211,10 +1227,10 @@ read register \begin{Desc} \item[Returns:]current register value \end{Desc} \index{slsDetector@{sls\-Detector}!readTrimFile@{readTrimFile}} \index{readTrimFile@{readTrimFile}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\_\-detector\_\-module}$\ast$ sls\-Detector::read\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} $\ast$ {\em my\-Mod} = {\tt NULL})}\label{classslsDetector_e84b8a7a2b27db3f89a98f9f8a81efca} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual \bf{sls\_\-detector\_\-module}$\ast$ sls\-Detector::read\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} $\ast$ {\em my\-Mod} = {\tt NULL})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_612b52469e27c6675969499d3680abe6} -reads a trim file \begin{Desc} +Pure virtual function reads a trim file \begin{Desc} \item[Parameters:] \begin{description} \item[{\em fname}]name of the file to be read \item[{\em my\-Mod}]pointer to the module structure which has to be set. \par @@ -1222,74 +1238,80 @@ reads a trim file \begin{Desc} \end{Desc} \begin{Desc} \item[Returns:]the pointer to my\-Mod or NULL if reading the file failed \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::read\-Trim\-File}{p.}{classmythenDetector_2120f9105997fd8f8bf9165dbffc55e7} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_2120f9105997fd8f8bf9165dbffc55e7}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_f24af0459e8eb45c1bc9c68a870e5094}.\index{slsDetector@{sls\-Detector}!receiveChannel@{receiveChannel}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_2120f9105997fd8f8bf9165dbffc55e7}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_f24af0459e8eb45c1bc9c68a870e5094}.\index{slsDetector@{sls\-Detector}!receiveChannel@{receiveChannel}} \index{receiveChannel@{receiveChannel}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::receive\-Channel (\bf{sls\_\-detector\_\-channel} $\ast$)\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_39f8959a55e92c7b0817529270be7667} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::receive\-Channel (\bf{sls\_\-detector\_\-channel} $\ast$)\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_39f8959a55e92c7b0817529270be7667} receive a \doxyref{sls\_\-detector\_\-channel}{p.}{structsls__detector__channel} structure over socket \index{slsDetector@{sls\-Detector}!receiveChip@{receiveChip}} \index{receiveChip@{receiveChip}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::receive\-Chip (\bf{sls\_\-detector\_\-chip} $\ast$)\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_21d070352bfbf4745543c572bd6ae8f7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::receive\-Chip (\bf{sls\_\-detector\_\-chip} $\ast$)\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_21d070352bfbf4745543c572bd6ae8f7} receive a \doxyref{sls\_\-detector\_\-chip}{p.}{structsls__detector__chip} structure over socket \index{slsDetector@{sls\-Detector}!receiveModule@{receiveModule}} \index{receiveModule@{receiveModule}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::receive\-Module (\bf{sls\_\-detector\_\-module} $\ast$)\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_1356b4fabe6b1aaa9c67939ff9331f98} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::receive\-Module (\bf{sls\_\-detector\_\-module} $\ast$)\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_1356b4fabe6b1aaa9c67939ff9331f98} receive a \doxyref{sls\_\-detector\_\-module}{p.}{structsls__detector__module} structure over socket \index{slsDetector@{sls\-Detector}!resetMerging@{resetMerging}} \index{resetMerging@{resetMerging}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::reset\-Merging (float $\ast$ {\em mp}, float $\ast$ {\em mv}, float $\ast$ {\em me}, int $\ast$ {\em mm})}\label{classslsDetector_208c3a5a80ba931056f1f2ff3cb5d0e5} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::reset\-Merging (float $\ast$ {\em mp}, float $\ast$ {\em mv}, float $\ast$ {\em me}, int $\ast$ {\em mm})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_20156c620f868445e454bc4115871822} -sets the arrays of the merged data to 0. NB The array should be created with size $>$= 360./get\-Bin\-Size(); \begin{Desc} +pure virtual function sets the arrays of the merged data to 0. NB The array should be created with size $>$= 360./get\-Bin\-Size(); \begin{Desc} \item[Parameters:] \begin{description} \item[{\em mp}]already merged postions \item[{\em mv}]already merged data \item[{\em me}]already merged errors (squared sum) \item[{\em mm}]multiplicity of merged arrays \end{description} \end{Desc} \begin{Desc} \item[Returns:]OK or FAIL \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::reset\-Merging}{p.}{classmythenDetector_7d38c9af0d94bc15571c3c15b38f39a8} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_7d38c9af0d94bc15571c3c15b38f39a8}.\index{slsDetector@{sls\-Detector}!retrieveDetectorSetup@{retrieveDetectorSetup}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_7d38c9af0d94bc15571c3c15b38f39a8}.\index{slsDetector@{sls\-Detector}!retrieveDetectorSetup@{retrieveDetectorSetup}} \index{retrieveDetectorSetup@{retrieveDetectorSetup}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::retrieve\-Detector\-Setup (string const {\em fname})}\label{classslsDetector_233c3d27e9a946fb42b0aa49717d9251} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::retrieve\-Detector\-Setup (string const {\em fname})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_0ec6aa8998db1bee1b00aeecbe870d5f} -not yet implemented +Purely virtual function Should be implemented in the specific detector class /sa \doxyref{mythen\-Detector::retrieve\-Detector\-Setup}{p.}{classmythenDetector_8eedcd0b6739dd878559de5b675fae83} -should retrieve from a file all the current detector parameters \index{slsDetector@{sls\-Detector}!sendChannel@{sendChannel}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_8eedcd0b6739dd878559de5b675fae83}.\index{slsDetector@{sls\-Detector}!sendChannel@{sendChannel}} \index{sendChannel@{sendChannel}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::send\-Channel (\bf{sls\_\-detector\_\-channel} $\ast$)\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_5cd249f9a287b25af9a3a7e7e675c559} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::send\-Channel (\bf{sls\_\-detector\_\-channel} $\ast$)\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_5cd249f9a287b25af9a3a7e7e675c559} send a \doxyref{sls\_\-detector\_\-channel}{p.}{structsls__detector__channel} structure over socket \index{slsDetector@{sls\-Detector}!sendChip@{sendChip}} \index{sendChip@{sendChip}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::send\-Chip (\bf{sls\_\-detector\_\-chip} $\ast$)\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_1e92a814b83501cdef5771c1e5c477aa} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::send\-Chip (\bf{sls\_\-detector\_\-chip} $\ast$)\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_1e92a814b83501cdef5771c1e5c477aa} send a \doxyref{sls\_\-detector\_\-chip}{p.}{structsls__detector__chip} structure over socket \index{slsDetector@{sls\-Detector}!sendModule@{sendModule}} \index{sendModule@{sendModule}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::send\-Module (\bf{sls\_\-detector\_\-module} $\ast$)\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_cc29561aa2b22ee49038c7bdf2be5ad7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::send\-Module (\bf{sls\_\-detector\_\-module} $\ast$)\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_cc29561aa2b22ee49038c7bdf2be5ad7} send a \doxyref{sls\_\-detector\_\-module}{p.}{structsls__detector__module} structure over socket \index{slsDetector@{sls\-Detector}!setAngularConversion@{setAngularConversion}} \index{setAngularConversion@{setAngularConversion}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::set\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})}\label{classslsDetector_30fe39ddd78fa880b6b7815d1d5462ec} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::set\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_0a17abc301de750f7dafd43b7ad8b0c9} -set angular conversion \begin{Desc} +pure virtual function set angular conversion \begin{Desc} \item[Parameters:] \begin{description} \item[{\em fname}]file with angular conversion constants (\char`\"{}\char`\"{} disable) \end{description} \end{Desc} \begin{Desc} \item[Returns:]0 if angular conversion disabled, $>$0 otherwise \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::set\-Angular\-Conversion}{p.}{classmythenDetector_78efe554a277de7fb8759307992fc61b} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_78efe554a277de7fb8759307992fc61b}.\index{slsDetector@{sls\-Detector}!setBadChannelCorrection@{setBadChannelCorrection}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_78efe554a277de7fb8759307992fc61b}.\index{slsDetector@{sls\-Detector}!setBadChannelCorrection@{setBadChannelCorrection}} \index{setBadChannelCorrection@{setBadChannelCorrection}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::set\-Bad\-Channel\-Correction (string {\em fname} = {\tt \char`\"{}\char`\"{}})}\label{classslsDetector_45833eb571b8cb20225f4046e2a17e5a} @@ -1303,12 +1325,21 @@ set bad channels correction \begin{Desc} \item[Returns:]0 if bad channel disabled, $>$0 otherwise \end{Desc} \index{slsDetector@{sls\-Detector}!setBinSize@{setBinSize}} \index{setBinSize@{setBinSize}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float sls\-Detector::set\-Bin\-Size (float {\em bs})\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_96e2fb6fb0aa34bdbe59facf367c4ae1} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual float sls\-Detector::set\-Bin\-Size (float {\em bs})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_1a2ebbe67dae42059723071f437eb721} -set detector bin size used for merging (approx angular resolution) +pure virtual function set detector bin size used for merging (approx angular resolution) \begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em bs}]bin size in degrees \end{description} +\end{Desc} +\begin{Desc} +\item[Returns:]current bin size \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::set\-Bin\-Size}{p.}{classmythenDetector_8f466447f886379204a59eb6785f1ed0} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_8f466447f886379204a59eb6785f1ed0}.\index{slsDetector@{sls\-Detector}!setCalDir@{setCalDir}} + +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_8f466447f886379204a59eb6785f1ed0}.\index{slsDetector@{sls\-Detector}!setCalDir@{setCalDir}} \index{setCalDir@{setCalDir}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}char$\ast$ sls\-Detector::set\-Cal\-Dir (string {\em s})\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_9c4d2c796c176852537ff3cff4f5974b} @@ -1369,14 +1400,7 @@ configure chip \begin{Desc} \item[Returns:]current register value \end{Desc} \begin{Desc} \item[See also:]\doxyref{sls\_\-detector\_\-chip}{p.}{structsls__detector__chip} \end{Desc} -\index{slsDetector@{sls\-Detector}!setClockDivider@{setClockDivider}} -\index{setClockDivider@{setClockDivider}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::set\-Clock\-Divider (int {\em i})\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_49af64998d4a4d44e965eb0adb1facb2} - - -set clock divider - -not implemented (should be something more general like \char`\"{}set speed including also waitstates, set cycles etc.) \index{slsDetector@{sls\-Detector}!setDAC@{setDAC}} +\index{slsDetector@{sls\-Detector}!setDAC@{setDAC}} \index{setDAC@{setDAC}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}float sls\-Detector::set\-DAC (float {\em val}, \bf{dac\-Index} {\em index}, int {\em imod} = {\tt -1})}\label{classslsDetector_cfcce08c547e24dc09968a74e35daf40} @@ -1486,12 +1510,14 @@ sets the default output files path \begin{Desc} \item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \end{Desc} \index{slsDetector@{sls\-Detector}!setFineOffset@{setFineOffset}} \index{setFineOffset@{setFineOffset}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float sls\-Detector::set\-Fine\-Offset (float {\em f})\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_fd3b79c59688a7a0f4f72ba5676a2f9b} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual float sls\-Detector::set\-Fine\-Offset (float {\em f})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_7b3b6b3ac5b3b1ee0677f7deeec5c9e3} -set detector fine offset +pure virtual function set detector fine offset \begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::set\-Fine\-Offset}{p.}{classmythenDetector_fe142e36f1a5fa8b2ab5fc45e9f8c781} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_fe142e36f1a5fa8b2ab5fc45e9f8c781}.\index{slsDetector@{sls\-Detector}!setFlatFieldCorrection@{setFlatFieldCorrection}} + +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_fe142e36f1a5fa8b2ab5fc45e9f8c781}.\index{slsDetector@{sls\-Detector}!setFlatFieldCorrection@{setFlatFieldCorrection}} \index{setFlatFieldCorrection@{setFlatFieldCorrection}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::set\-Flat\-Field\-Correction (string {\em fname} = {\tt \char`\"{}\char`\"{}})}\label{classslsDetector_b4e2c11303714d5e62b4fcc22f829d8f} @@ -1505,12 +1531,14 @@ set flat field corrections \begin{Desc} \item[Returns:]0 if disable (or file could not be read), $>$0 otherwise \end{Desc} \index{slsDetector@{sls\-Detector}!setGlobalOffset@{setGlobalOffset}} \index{setGlobalOffset@{setGlobalOffset}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float sls\-Detector::set\-Global\-Offset (float {\em f})\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_84c8dc8017e692d93246cd546e6366c1} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual float sls\-Detector::set\-Global\-Offset (float {\em f})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_2a03a8aec6dbf74a606e6960e178fceb} -set detector global offset +pure virtual function set detector global offset \begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::set\-Global\-Offset}{p.}{classmythenDetector_e24dd88c4eb965687bd656a12bae8ad7} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_e24dd88c4eb965687bd656a12bae8ad7}.\index{slsDetector@{sls\-Detector}!setModule@{setModule}} + +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_e24dd88c4eb965687bd656a12bae8ad7}.\index{slsDetector@{sls\-Detector}!setModule@{setModule}} \index{setModule@{setModule}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::set\-Module (\bf{sls\_\-detector\_\-module} {\em module})}\label{classslsDetector_d659b9a8ae9a29cea616e6333e2e7be4} @@ -1565,19 +1593,21 @@ sets the online\-Flag \begin{Desc} \end{Desc} \index{slsDetector@{sls\-Detector}!setPositions@{setPositions}} \index{setPositions@{setPositions}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::set\-Positions (int {\em n\-Pos}, float $\ast$ {\em pos})\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_ed6493ad015660281b14814f9a7f6cb5} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::set\-Positions (int {\em n\-Pos}, float $\ast$ {\em pos})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_961e3976e3077803e2fc245873f81d81} -set positions for the acquisition \begin{Desc} +pure virtual function set positions for the acquisition \begin{Desc} \item[Parameters:] \begin{description} \item[{\em n\-Pos}]number of positions \item[{\em pos}]array with the encoder positions \end{description} \end{Desc} \begin{Desc} \item[Returns:]number of positions \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::set\-Positions}{p.}{classmythenDetector_1ffb0963f724e6d6d497685e6de62fd6} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_1ffb0963f724e6d6d497685e6de62fd6}.\index{slsDetector@{sls\-Detector}!setRateCorrection@{setRateCorrection}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_1ffb0963f724e6d6d497685e6de62fd6}.\index{slsDetector@{sls\-Detector}!setRateCorrection@{setRateCorrection}} \index{setRateCorrection@{setRateCorrection}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::set\-Rate\-Correction (float {\em t} = {\tt 0})}\label{classslsDetector_c89f7fc9f9255e573e34f8d3dadf38af} @@ -1608,14 +1638,7 @@ set/get readout flags \begin{Desc} set roi -not yet implemented \index{slsDetector@{sls\-Detector}!setSetLength@{setSetLength}} -\index{setSetLength@{setSetLength}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::set\-Set\-Length (int {\em i})\hspace{0.3cm}{\tt [inline]}}\label{classslsDetector_f936cf5840bded81acb3f93b6b5fdd1c} - - -set length cycles - -not implemented (should be something more general like \char`\"{}set speed including also waitstates, set cycles etc.) \index{slsDetector@{sls\-Detector}!setSettings@{setSettings}} +not yet implemented \index{slsDetector@{sls\-Detector}!setSettings@{setSettings}} \index{setSettings@{setSettings}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{detector\-Settings} sls\-Detector::set\-Settings (\bf{detector\-Settings} {\em isettings}, int {\em imod} = {\tt -1})}\label{classslsDetector_765072d5c8aaff56ca79734072607188} @@ -1627,7 +1650,21 @@ set detector settings \begin{Desc} \end{Desc} \begin{Desc} \item[Returns:]current settings\end{Desc} -in this function trimbits and calibration files are searched in the trim\-Dir and cal\-Dir directories and the detector is initialized \index{slsDetector@{sls\-Detector}!setTCPSocket@{setTCPSocket}} +in this function trimbits and calibration files are searched in the trim\-Dir and cal\-Dir directories and the detector is initialized \index{slsDetector@{sls\-Detector}!setSpeed@{setSpeed}} +\index{setSpeed@{setSpeed}!slsDetector@{sls\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::set\-Speed (\bf{speed\-Variable} {\em sp}, int {\em value} = {\tt -1})}\label{classslsDetector_8e35d9440a03e127ef5fe7a909702675} + + +sets/gets the value of important readout speed parameters \begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em sp}]is the parameter to be set/get \item[{\em value}]is the value to be set, if -1 get value \end{description} +\end{Desc} +\begin{Desc} +\item[Returns:]current value for the specified parameter \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{speed\-Variable}{p.}{sls__detector__defs_8h_8c326f6a87754392b72098d3d0dec49d} \end{Desc} +\index{slsDetector@{sls\-Detector}!setTCPSocket@{setTCPSocket}} \index{setTCPSocket@{setTCPSocket}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::set\-TCPSocket (string const {\em name} = {\tt \char`\"{}\char`\"{}}, int const {\em control\_\-port} = {\tt -1}, int const {\em stop\_\-port} = {\tt -1}, int const {\em data\_\-port} = {\tt -1})}\label{classslsDetector_019a01c4465c5ee572293cb6c00d9904} @@ -1704,7 +1741,7 @@ start readout (without exposure or interrupting exposure) \begin{Desc} \item[Returns:]OK/FAIL \end{Desc} \index{slsDetector@{sls\-Detector}!startThread@{startThread}} \index{startThread@{startThread}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void sls\-Detector::start\-Thread ()\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_58199d3393aa7eaa606cbb7cbf83469d} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void sls\-Detector::start\-Thread ()\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_58199d3393aa7eaa606cbb7cbf83469d} start data processing threas \index{slsDetector@{sls\-Detector}!stopAcquisition@{stopAcquisition}} @@ -1716,68 +1753,72 @@ stop detector acquisition \begin{Desc} \item[Returns:]OK/FAIL \end{Desc} \index{slsDetector@{sls\-Detector}!writeAngularConversion@{writeAngularConversion}} \index{writeAngularConversion@{writeAngularConversion}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::write\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})}\label{classslsDetector_921f212286be085d7e1b8d0d11110d9c} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::write\-Angular\-Conversion (string {\em fname} = {\tt \char`\"{}\char`\"{}})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_cace8f0d8706a175915289d86c1fd8d6} -writes an angular conversion file \begin{Desc} +Pure virtual function writes an angular conversion file \begin{Desc} \item[Parameters:] \begin{description} \item[{\em fname}]file to be written \end{description} \end{Desc} \begin{Desc} -\item[See also:]\doxyref{angle\-Conversion\-Constant}{p.}{structangleConversionConstant} \end{Desc} +\item[See also:]\doxyref{angle\-Conversion\-Constant}{p.}{structangleConversionConstant} \doxyref{mythen\-Detector::write\-Angular\-Conversion}{p.}{classmythenDetector_3c5f27709351c49dd715212adc5ba7d2} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_3c5f27709351c49dd715212adc5ba7d2}.\index{slsDetector@{sls\-Detector}!writeCalibrationFile@{writeCalibrationFile}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_3c5f27709351c49dd715212adc5ba7d2}.\index{slsDetector@{sls\-Detector}!writeCalibrationFile@{writeCalibrationFile}} \index{writeCalibrationFile@{writeCalibrationFile}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::write\-Calibration\-File (string {\em fname}, float {\em gain}, float {\em offset})}\label{classslsDetector_8eb676a1ab6ef35601ba5cae942ba380} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::write\-Calibration\-File (string {\em fname}, float {\em gain}, float {\em offset})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_d12edef440bf2b2f930e83f0ccceb01e} -writes a clibration file \begin{Desc} +Pure virtual function writes a calibration file \begin{Desc} \item[Parameters:] \begin{description} \item[{\em fname}]file to be written \item[{\em gain}]\item[{\em offset}]\end{description} \end{Desc} \begin{Desc} -\item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \end{Desc} +\item[See also:]\doxyref{shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \doxyref{mythen\-Detector::write\-Calibration\-File}{p.}{classmythenDetector_10e7213bb0e7138c07231687e9a6899a} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_10e7213bb0e7138c07231687e9a6899a}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_d5fbecfcc46cb151160c6011aa8e33b2}.\index{slsDetector@{sls\-Detector}!writeConfigurationFile@{writeConfigurationFile}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_10e7213bb0e7138c07231687e9a6899a}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_d5fbecfcc46cb151160c6011aa8e33b2}.\index{slsDetector@{sls\-Detector}!writeConfigurationFile@{writeConfigurationFile}} \index{writeConfigurationFile@{writeConfigurationFile}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::write\-Configuration\-File (string const {\em fname})}\label{classslsDetector_82628148e11f4890c9d935ec921c1121} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::write\-Configuration\-File (string const {\em fname})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_7801c6d43c72ce5ccaa72743a6f307d2} -Every detector should have a basic configuration file containing: type (mythen, pilatus etc.) hostname portnumber communication type (default TCP/IP) eventually secondary portnumber (e.g. mythen stop function) number of modules installed if different from the detector size (x,y) +Purely virtual function Should be implemented in the specific detector class /sa \doxyref{mythen\-Detector::write\-Configuration\-File}{p.}{classmythenDetector_6ad688e0c1a59001ecc61117c67e5434} -to be changed \index{slsDetector@{sls\-Detector}!writeDataFile@{writeDataFile}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_6ad688e0c1a59001ecc61117c67e5434}.\index{slsDetector@{sls\-Detector}!writeDataFile@{writeDataFile}} \index{writeDataFile@{writeDataFile}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::write\-Data\-File (string {\em fname}, int $\ast$ {\em data})}\label{classslsDetector_3e1a8e49fbfb34a54381452abc8b5258} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::write\-Data\-File (string {\em fname}, int $\ast$ {\em data})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_efa98ca652306e2a026c9a5b2fbfe2dc} -writes a data file \begin{Desc} +Pure virtual function writes a data file \begin{Desc} \item[Parameters:] \begin{description} \item[{\em name}]of the file to be written \item[{\em data}]array of data values \end{description} \end{Desc} \begin{Desc} \item[Returns:]OK or FAIL if it could not write the file or data=NULL \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::write\-Data\-File}{p.}{classmythenDetector_42c1d320f594ebd87e2465cc986ee848} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_9a49c84d7ad664f7891b00fba0ce829a}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_68a740d5e43fcdb00c57f401666c0856}.\index{slsDetector@{sls\-Detector}!writeDataFile@{writeDataFile}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_9a49c84d7ad664f7891b00fba0ce829a}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_68a740d5e43fcdb00c57f401666c0856}.\index{slsDetector@{sls\-Detector}!writeDataFile@{writeDataFile}} \index{writeDataFile@{writeDataFile}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::write\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt -1})}\label{classslsDetector_889c060afb5693830ca2be4fc6a5442c} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::write\-Data\-File (string {\em fname}, float $\ast$ {\em data}, float $\ast$ {\em err} = {\tt NULL}, float $\ast$ {\em ang} = {\tt NULL}, char {\em dataformat} = {\tt 'f'}, int {\em nch} = {\tt -1})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_08823d7078b5e6dd1a4cb7d8b3cfe0af} -writes a data file \begin{Desc} +Pure virtual function writes a data file \begin{Desc} \item[Parameters:] \begin{description} \item[{\em name}]of the file to be written \item[{\em data}]array of data values \item[{\em err}]array of arrors on the data. If NULL no errors will be written\item[{\em ang}]array of angular values. If NULL data will be in the form chan-val(-err) otherwise ang-val(-err) \item[{\em dataformat}]format of the data: can be 'i' integer or 'f' float (default) \item[{\em nch}]number of channels to be written to file. if -1 defaults to the number of installed channels of the detector \end{description} \end{Desc} \begin{Desc} \item[Returns:]OK or FAIL if it could not write the file or data=NULL \end{Desc} +\begin{Desc} +\item[See also:]\doxyref{mythen\-Detector::write\-Data\-File}{p.}{classmythenDetector_42c1d320f594ebd87e2465cc986ee848} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_42c1d320f594ebd87e2465cc986ee848}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_5ad2bf5b10d17e8c4ad7ae6e81e647e0}.\index{slsDetector@{sls\-Detector}!writeRegister@{writeRegister}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_42c1d320f594ebd87e2465cc986ee848}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_5ad2bf5b10d17e8c4ad7ae6e81e647e0}.\index{slsDetector@{sls\-Detector}!writeRegister@{writeRegister}} \index{writeRegister@{writeRegister}!slsDetector@{sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::write\-Register (int {\em addr}, int {\em val})}\label{classslsDetector_742c8c6b4e7f3cad4f7e60c8c7c0c18b} @@ -1791,10 +1832,10 @@ write register \begin{Desc} \item[Returns:]current register value \end{Desc} \index{slsDetector@{sls\-Detector}!writeTrimFile@{writeTrimFile}} \index{writeTrimFile@{writeTrimFile}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::write\-Trim\-File (string {\em fname}, int {\em imod})}\label{classslsDetector_afe675432bf8e5dcb47774da3cc81106} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::write\-Trim\-File (string {\em fname}, int {\em imod})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_cb27a987551e66093eb201523ac8d8b0} -writes a trim file for module number imod - the values will be read from the current detector structure \begin{Desc} +Pure virtual function writes a trim file for module number imod - the values will be read from the current detector structure \begin{Desc} \item[Parameters:] \begin{description} \item[{\em fname}]name of the file to be written \item[{\em imod}]module number \end{description} @@ -1802,15 +1843,15 @@ writes a trim file for module number imod - the values will be read from the cur \begin{Desc} \item[Returns:]OK or FAIL if the file could not be written \end{Desc} \begin{Desc} -\item[See also:]\doxyref{sls\_\-detector\_\-module}{p.}{structsls__detector__module} \doxyref{shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \end{Desc} +\item[See also:]\doxyref{sls\_\-detector\_\-module}{p.}{structsls__detector__module} \doxyref{shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \doxyref{mythen\-Detector::write\-Trim\-File(string, int)}{p.}{classmythenDetector_94179431a737bbceb20f27ca1fd30349} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_94179431a737bbceb20f27ca1fd30349}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_df3a0dff0fc3111e10af0363bdd15a6a}.\index{slsDetector@{sls\-Detector}!writeTrimFile@{writeTrimFile}} +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_94179431a737bbceb20f27ca1fd30349}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_df3a0dff0fc3111e10af0363bdd15a6a}.\index{slsDetector@{sls\-Detector}!writeTrimFile@{writeTrimFile}} \index{writeTrimFile@{writeTrimFile}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int sls\-Detector::write\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} {\em mod})}\label{classslsDetector_9cbb1f97b8e48bd4b108a2dfa992c6af} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}virtual int sls\-Detector::write\-Trim\-File (string {\em fname}, \bf{sls\_\-detector\_\-module} {\em mod})\hspace{0.3cm}{\tt [pure virtual]}}\label{classslsDetector_5b97351cfaffe067016dbcebbd0778a7} -writes a trim file \begin{Desc} +Pure virtual function writes a trim file \begin{Desc} \item[Parameters:] \begin{description} \item[{\em fname}]name of the file to be written \item[{\em mod}]module structure which has to be written to file \end{description} @@ -1818,134 +1859,134 @@ writes a trim file \begin{Desc} \begin{Desc} \item[Returns:]OK or FAIL if the file could not be written\end{Desc} \begin{Desc} -\item[See also:]\doxyref{sls\_\-detector\_\-module}{p.}{structsls__detector__module} \end{Desc} +\item[See also:]\doxyref{sls\_\-detector\_\-module}{p.}{structsls__detector__module} \doxyref{mythen\-Detector::write\-Trim\-File(string, sls\_\-detector\_\-module)}{p.}{classmythenDetector_0b137abd78bd3d03653cd21436eb6c4d} \end{Desc} -Reimplemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_0b137abd78bd3d03653cd21436eb6c4d}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_8380366bf7112021c49be8e6f29f18d8}. +Implemented in \bf{mythen\-Detector} \doxyref{p.}{classmythenDetector_0b137abd78bd3d03653cd21436eb6c4d}, and \bf{eiger\-Detector} \doxyref{p.}{classeigerDetector_8380366bf7112021c49be8e6f29f18d8}. \subsection{Member Data Documentation} \index{slsDetector@{sls\-Detector}!adcs@{adcs}} \index{adcs@{adcs}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::adcs}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_f370b8466441491d8496bb8130b8c5e7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::adcs}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_f370b8466441491d8496bb8130b8c5e7} pointer to adc valuse \index{slsDetector@{sls\-Detector}!badChannelMask@{badChannelMask}} \index{badChannelMask@{badChannelMask}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int$\ast$ \bf{sls\-Detector::bad\-Channel\-Mask}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_614c98f77a8a3ec6cff57aa59e671123} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int$\ast$ \bf{sls\-Detector::bad\-Channel\-Mask}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_614c98f77a8a3ec6cff57aa59e671123} pointer to bad channel mask 0 is channel is good 1 if it is bad\begin{Desc} \item[See also:]\doxyref{fill\-Bad\-Channel\-Mask()}{p.}{classslsDetector_6a0ebe013e27c065b2f67158a27f64ac} \end{Desc} \index{slsDetector@{sls\-Detector}!chanregs@{chanregs}} \index{chanregs@{chanregs}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int$\ast$ \bf{sls\-Detector::chanregs}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_44335474559f7321f0309fbda304caf8} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int$\ast$ \bf{sls\-Detector::chanregs}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_44335474559f7321f0309fbda304caf8} pointer to channal registers \index{slsDetector@{sls\-Detector}!chipregs@{chipregs}} \index{chipregs@{chipregs}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int$\ast$ \bf{sls\-Detector::chipregs}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_0eb24981d044632eccba507bd15871a6} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int$\ast$ \bf{sls\-Detector::chipregs}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_0eb24981d044632eccba507bd15871a6} pointer to chip registers \index{slsDetector@{sls\-Detector}!controlSocket@{controlSocket}} \index{controlSocket@{controlSocket}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{My\-Socket\-TCP}$\ast$ \bf{sls\-Detector::control\-Socket}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_07f3943ab8a65f061bbe1c1e1d22b700} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{My\-Socket\-TCP}$\ast$ \bf{sls\-Detector::control\-Socket}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_07f3943ab8a65f061bbe1c1e1d22b700} socket for control commands \index{slsDetector@{sls\-Detector}!currentI0@{currentI0}} \index{currentI0@{currentI0}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float \bf{sls\-Detector::current\-I0}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_4bba77b0de9f911c87d48d12c15a632b} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float \bf{sls\-Detector::current\-I0}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_4bba77b0de9f911c87d48d12c15a632b} I0 measured \index{slsDetector@{sls\-Detector}!currentPosition@{currentPosition}} \index{currentPosition@{currentPosition}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float \bf{sls\-Detector::current\-Position}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_9f64e866250e916299048c9816c9ef28} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float \bf{sls\-Detector::current\-Position}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_9f64e866250e916299048c9816c9ef28} current position of the detector \index{slsDetector@{sls\-Detector}!currentPositionIndex@{currentPositionIndex}} \index{currentPositionIndex@{currentPositionIndex}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float \bf{sls\-Detector::current\-Position\-Index}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_9a6cd8787f618c147faacc1f3602bcf5} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float \bf{sls\-Detector::current\-Position\-Index}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_9a6cd8787f618c147faacc1f3602bcf5} current position index of the detector \index{slsDetector@{sls\-Detector}!dacs@{dacs}} \index{dacs@{dacs}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::dacs}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_dc1b3f867b97136fca83f86c83b7ae14} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::dacs}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_dc1b3f867b97136fca83f86c83b7ae14} pointer to dac valuse \index{slsDetector@{sls\-Detector}!dataProcessingThread@{dataProcessingThread}} \index{dataProcessingThread@{dataProcessingThread}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}pthread\_\-t \bf{sls\-Detector::data\-Processing\-Thread}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_8257cca09e23b601764e57f5a8bdaacd} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}pthread\_\-t \bf{sls\-Detector::data\-Processing\-Thread}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_8257cca09e23b601764e57f5a8bdaacd} data processing thread??? \index{slsDetector@{sls\-Detector}!dataQueue@{dataQueue}} \index{dataQueue@{dataQueue}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}queue$<$int$\ast$$>$ \bf{sls\-Detector::data\-Queue}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_52e9fe9baf37db001cdf58f982ab5dd6} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}queue$<$int$\ast$$>$ \bf{sls\-Detector::data\-Queue}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_52e9fe9baf37db001cdf58f982ab5dd6} data queue \index{slsDetector@{sls\-Detector}!dataSocket@{dataSocket}} \index{dataSocket@{dataSocket}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{My\-Socket\-TCP}$\ast$ \bf{sls\-Detector::data\-Socket}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_1629e3c46678ae201f6797e4d827cb32} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{My\-Socket\-TCP}$\ast$ \bf{sls\-Detector::data\-Socket}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_1629e3c46678ae201f6797e4d827cb32} socket for data acquisition \index{slsDetector@{sls\-Detector}!detectorModules@{detectorModules}} \index{detectorModules@{detectorModules}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\_\-detector\_\-module}$\ast$ \bf{sls\-Detector::detector\-Modules}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_b78d6f2abc185b2bde2c550b31e0ff72} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{sls\_\-detector\_\-module}$\ast$ \bf{sls\-Detector::detector\-Modules}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_b78d6f2abc185b2bde2c550b31e0ff72} pointer to detector module structures \index{slsDetector@{sls\-Detector}!detId@{detId}} \index{detId@{detId}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int \bf{sls\-Detector::det\-Id}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_37f4af284283e7a18a28cec3f4e4532f} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int \bf{sls\-Detector::det\-Id}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_37f4af284283e7a18a28cec3f4e4532f} detector ID \index{slsDetector@{sls\-Detector}!ffcoefficients@{ffcoefficients}} \index{ffcoefficients@{ffcoefficients}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::ffcoefficients}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_a3c6e93198a2f8b072b7b84ba9af7c4b} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::ffcoefficients}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_a3c6e93198a2f8b072b7b84ba9af7c4b} pointer to flat field coefficients \index{slsDetector@{sls\-Detector}!fferrors@{fferrors}} \index{fferrors@{fferrors}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::fferrors}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_636168b92509e96418c9134d6d82ad4c} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::fferrors}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_636168b92509e96418c9134d6d82ad4c} pointer to flat field coefficient errors \index{slsDetector@{sls\-Detector}!mergingBins@{mergingBins}} \index{mergingBins@{mergingBins}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::merging\-Bins}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_81751fd6e87f9659a8b6afe13efec2cf} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::merging\-Bins}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_81751fd6e87f9659a8b6afe13efec2cf} merging bins \index{slsDetector@{sls\-Detector}!mergingCounts@{mergingCounts}} \index{mergingCounts@{mergingCounts}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::merging\-Counts}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_fc173dcaeda2bbd7bbd6a874b5b5726c} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::merging\-Counts}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_fc173dcaeda2bbd7bbd6a874b5b5726c} merging counts \index{slsDetector@{sls\-Detector}!mergingErrors@{mergingErrors}} \index{mergingErrors@{mergingErrors}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::merging\-Errors}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_f357d3b5961ead7ec263a47aa51c4c11} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}float$\ast$ \bf{sls\-Detector::merging\-Errors}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_f357d3b5961ead7ec263a47aa51c4c11} merging errors \index{slsDetector@{sls\-Detector}!mergingMultiplicity@{mergingMultiplicity}} \index{mergingMultiplicity@{mergingMultiplicity}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int$\ast$ \bf{sls\-Detector::merging\-Multiplicity}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_91c5e22042997d86c2c4d16ef1be9150} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int$\ast$ \bf{sls\-Detector::merging\-Multiplicity}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_91c5e22042997d86c2c4d16ef1be9150} merging multiplicity \index{slsDetector@{sls\-Detector}!onlineFlag@{onlineFlag}} \index{onlineFlag@{onlineFlag}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int \bf{sls\-Detector::online\-Flag}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_7572bba8e53f900d4126657827bec3cf} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int \bf{sls\-Detector::online\-Flag}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_7572bba8e53f900d4126657827bec3cf} \begin{Desc} \item[See also:]\doxyref{set\-Online}{p.}{classslsDetector_f041f723f702c17de292061d6d609698} \end{Desc} \index{slsDetector@{sls\-Detector}!shmId@{shmId}} \index{shmId@{shmId}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int \bf{sls\-Detector::shm\-Id}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_53a78c7fe99f93b9bba8d0c2cb32a181} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int \bf{sls\-Detector::shm\-Id}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_53a78c7fe99f93b9bba8d0c2cb32a181} shared memeory ID \index{slsDetector@{sls\-Detector}!stopSocket@{stopSocket}} \index{stopSocket@{stopSocket}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{My\-Socket\-TCP}$\ast$ \bf{sls\-Detector::stop\-Socket}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_efee578cdd732339788a38707e5ce531} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{My\-Socket\-TCP}$\ast$ \bf{sls\-Detector::stop\-Socket}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_efee578cdd732339788a38707e5ce531} socket for emergency stop \index{slsDetector@{sls\-Detector}!thisDetector@{thisDetector}} \index{thisDetector@{thisDetector}!slsDetector@{sls\-Detector}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{shared\-Sls\-Detector}$\ast$ \bf{sls\-Detector::this\-Detector}\hspace{0.3cm}{\tt [private]}}\label{classslsDetector_fe0da5c1491ebf18f187f0a26c5ded11} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\bf{shared\-Sls\-Detector}$\ast$ \bf{sls\-Detector::this\-Detector}\hspace{0.3cm}{\tt [protected]}}\label{classslsDetector_fe0da5c1491ebf18f187f0a26c5ded11} address of the detector structure in shared memory diff --git a/slsDetectorSoftware/docs/latex/doxygen.sty b/slsDetectorSoftware/docs/latex/doxygen.sty index aed2ed8e4..687c528aa 100644 --- a/slsDetectorSoftware/docs/latex/doxygen.sty +++ b/slsDetectorSoftware/docs/latex/doxygen.sty @@ -10,8 +10,8 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Fri Oct 9 16:01:04 2009 by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Oct 9 16:01:04 2009 by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Tue Dec 1 10:56:45 2009 by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Tue Dec 1 10:56:45 2009 by Doxygen }} \cfoot{} \newenvironment{Code} {\footnotesize} diff --git a/slsDetectorSoftware/docs/latex/index.tex b/slsDetectorSoftware/docs/latex/index.tex index 937b3c404..73bc3d522 100644 --- a/slsDetectorSoftware/docs/latex/index.tex +++ b/slsDetectorSoftware/docs/latex/index.tex @@ -5,7 +5,12 @@ The architecture of the acquisitions system is intended as follows: \begin{itemi \item A socket server running on the detector (or more than one in some special cases) \item C++ classes common to all detectors for client-server communication. These can be supplied to users as libraries and embedded also in acquisition systems which are not developed by the SLS\begin{Desc} \item[See also:]\doxyref{My\-Socket\-TCP}{p.}{classMySocketTCP} \doxyref{sls\-Detector}{p.}{classslsDetector} \end{Desc} \item the possibility of using a Qt-based graphical user interface (with eventually root analisys capabilities) \item the possibility of runnin alla commands from command line. In order to ensure a fast operation of this so called \char`\"{}text client\char`\"{} the detector parameters should not be re-initialized everytime. For this reason a shared memory block is allocated where the main detector flags and parameters are stored\begin{Desc} -\item[See also:]\doxyref{sls\-Detector::shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector}\end{Desc} +\item[See also:]\doxyref{sls\-Detector::shared\-Sls\-Detector}{p.}{structslsDetector_1_1sharedSlsDetector} \end{Desc} +\end{itemize} +\section{How to use it}\label{index_howto_sec} +The best way to operate the sls\-Detectors is to use the software (text client or GUI) developed by the sls detectors group. In case you need to embed the detector control in a previously existing software, compile these classes using \par + make package \par + and link the shared library created to your software bin/lib\-Sls\-Detector.so.1.0.1 Then in your software you should use the class related to the detector you want to control (\doxyref{mythen\-Detector}{p.}{classmythenDetector} or \doxyref{eiger\-Detector}{p.}{classeigerDetector}). + \begin{Desc} \item[Author:]Anna Bergamaschi \end{Desc} -\end{itemize} diff --git a/slsDetectorSoftware/docs/latex/mythenDetector_8h.tex b/slsDetectorSoftware/docs/latex/mythenDetector_8h.tex index cc3a0d908..19e38241c 100644 --- a/slsDetectorSoftware/docs/latex/mythenDetector_8h.tex +++ b/slsDetectorSoftware/docs/latex/mythenDetector_8h.tex @@ -5,4 +5,17 @@ \begin{CompactItemize} \item class \bf{mythen\-Detector} -\begin{CompactList}\small\item\em This calss contains all mythen specific functions. \item\end{CompactList}\end{CompactItemize} +\end{CompactItemize} +\subsection*{Defines} +\begin{CompactItemize} +\item +\#define \bf{default\-TDead}~\{170,90,750\} +\end{CompactItemize} + + +\subsection{Define Documentation} +\index{mythenDetector.h@{mythen\-Detector.h}!defaultTDead@{defaultTDead}} +\index{defaultTDead@{defaultTDead}!mythenDetector.h@{mythen\-Detector.h}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}\#define default\-TDead~\{170,90,750\}}\label{mythenDetector_8h_082faba3de8ce8379e160e3067333d14} + + diff --git a/slsDetectorSoftware/docs/latex/refman.tex b/slsDetectorSoftware/docs/latex/refman.tex index d8b5658a3..ea048c804 100644 --- a/slsDetectorSoftware/docs/latex/refman.tex +++ b/slsDetectorSoftware/docs/latex/refman.tex @@ -19,7 +19,7 @@ \vspace*{1cm} {\large Generated by Doxygen 1.4.7}\\ \vspace*{0.5cm} -{\small Fri Oct 9 16:01:04 2009}\\ +{\small Tue Dec 1 10:56:45 2009}\\ \end{center} \end{titlepage} \clearemptydoublepage diff --git a/slsDetectorSoftware/docs/latex/slsDetector_8h.tex b/slsDetectorSoftware/docs/latex/slsDetector_8h.tex index 3e9098bf3..5593318b2 100644 --- a/slsDetectorSoftware/docs/latex/slsDetector_8h.tex +++ b/slsDetectorSoftware/docs/latex/slsDetector_8h.tex @@ -74,7 +74,7 @@ struct \bf{sls\-Detector::shared\-Sls\-Detector} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}\#define default\-TDead~\{170,90,750\}}\label{slsDetector_8h_082faba3de8ce8379e160e3067333d14} -\index{slsDetector.h@{sls\-Detector.h}!MAX_BADCHANS@{MAX\_\-BADCHANS}} +should be changed in order to have it separate for the different detector types \index{slsDetector.h@{sls\-Detector.h}!MAX_BADCHANS@{MAX\_\-BADCHANS}} \index{MAX_BADCHANS@{MAX\_\-BADCHANS}!slsDetector.h@{sls\-Detector.h}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}\#define MAX\_\-BADCHANS~2000}\label{slsDetector_8h_458ac030ac964822b06ae7659da870df} diff --git a/slsDetectorSoftware/docs/latex/sls__detector__defs_8h.tex b/slsDetectorSoftware/docs/latex/sls__detector__defs_8h.tex index 3fa906e5a..b889a566d 100644 --- a/slsDetectorSoftware/docs/latex/sls__detector__defs_8h.tex +++ b/slsDetectorSoftware/docs/latex/sls__detector__defs_8h.tex @@ -59,7 +59,8 @@ enum \bf{dimension} \{ \bf{X} = 0, \} \item enum \{ \bf{OK}, -\bf{FAIL} +\bf{FAIL}, +\bf{FINISHED} \} \item enum \{ \bf{DISABLED}, @@ -173,6 +174,11 @@ enum \bf{timer\-Index} \{ \par \bf{CYCLES\_\-NUMBER} \} \item +enum \bf{speed\-Variable} \{ \bf{CLOCK\_\-DIVIDER}, +\bf{WAIT\_\-STATES}, +\bf{SET\_\-SIGNAL\_\-LENGTH} + \} +\item enum \bf{read\-Out\-Flags} \{ \par \bf{GET\_\-READOUT\_\-FLAGS} = -1, \bf{NORMAL\_\-READOUT} = 0, @@ -256,7 +262,9 @@ enum \{ \par \par \bf{F\_\-SET\_\-READOUT\_\-FLAGS}, \bf{F\_\-SET\_\-ROI}, +\bf{F\_\-SET\_\-SPEED}, \bf{F\_\-EXECUTE\_\-TRIMMING}, +\par \bf{F\_\-EXIT\_\-SERVER} \} \end{CompactItemize} @@ -297,6 +305,8 @@ return values \begin{Desc} OK\label{sls__detector__defs_8h_df764cbdea00d65edcd07bb9953ad2b72bc49ec37d6a5715dd23e85f1ff5bb59} }]function succeeded \index{FAIL@{FAIL}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}}\index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!FAIL@{FAIL}}\item[{\em FAIL\label{sls__detector__defs_8h_df764cbdea00d65edcd07bb9953ad2b7936c4a5547a9360243178f726f6b2715} +}]function failed \index{FINISHED@{FINISHED}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}}\index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!FINISHED@{FINISHED}}\item[{\em +FINISHED\label{sls__detector__defs_8h_df764cbdea00d65edcd07bb9953ad2b7dbd1812bee789fbf3548cf79d3f2b400} }]function failed \end{description} \end{Desc} @@ -405,7 +415,9 @@ F\_\-SET\_\-DYNAMIC\_\-RANGE\label{sls__detector__defs_8h_bc6126af1d45847bc59afa F\_\-SET\_\-READOUT\_\-FLAGS\label{sls__detector__defs_8h_bc6126af1d45847bc59afa0aa3216b045cdaebc62f9748ce0f9822f381959307} }]set/get readout flags \index{F_SET_ROI@{F\_\-SET\_\-ROI}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}}\index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!F_SET_ROI@{F\_\-SET\_\-ROI}}\item[{\em F\_\-SET\_\-ROI\label{sls__detector__defs_8h_bc6126af1d45847bc59afa0aa3216b04132603d9b086fb1178fbbd143d6aa126} -}]set/get region of interest \index{F_EXECUTE_TRIMMING@{F\_\-EXECUTE\_\-TRIMMING}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}}\index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!F_EXECUTE_TRIMMING@{F\_\-EXECUTE\_\-TRIMMING}}\item[{\em +}]set/get region of interest \index{F_SET_SPEED@{F\_\-SET\_\-SPEED}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}}\index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!F_SET_SPEED@{F\_\-SET\_\-SPEED}}\item[{\em +F\_\-SET\_\-SPEED\label{sls__detector__defs_8h_bc6126af1d45847bc59afa0aa3216b0457a41d958ac69f2c3d4ccf1b12cbd75f} +}]set/get readout speed parameters \index{F_EXECUTE_TRIMMING@{F\_\-EXECUTE\_\-TRIMMING}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}}\index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!F_EXECUTE_TRIMMING@{F\_\-EXECUTE\_\-TRIMMING}}\item[{\em F\_\-EXECUTE\_\-TRIMMING\label{sls__detector__defs_8h_bc6126af1d45847bc59afa0aa3216b045be80176327f8e6afd6954cc8fd0ceaa} }]execute trimming \index{F_EXIT_SERVER@{F\_\-EXIT\_\-SERVER}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}}\index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!F_EXIT_SERVER@{F\_\-EXIT\_\-SERVER}}\item[{\em F\_\-EXIT\_\-SERVER\label{sls__detector__defs_8h_bc6126af1d45847bc59afa0aa3216b04acb4344788e1f1e3716216aeffc50beb} @@ -782,6 +794,23 @@ BACKGROUND\_\-CORRECTIONS\label{sls__detector__defs_8h_6165e3e90182cc47b0003f328 }]background corrections \end{description} \end{Desc} +\index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!speedVariable@{speedVariable}} +\index{speedVariable@{speedVariable}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}enum \bf{speed\-Variable}}\label{sls__detector__defs_8h_8c326f6a87754392b72098d3d0dec49d} + + +important speed parameters \begin{Desc} +\item[Enumerator: ]\par +\begin{description} +\index{CLOCK_DIVIDER@{CLOCK\_\-DIVIDER}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}}\index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!CLOCK_DIVIDER@{CLOCK\_\-DIVIDER}}\item[{\em +CLOCK\_\-DIVIDER\label{sls__detector__defs_8h_8c326f6a87754392b72098d3d0dec49d3465852fc71156c546c9e211fb0babe8} +}]readout clock divider \index{WAIT_STATES@{WAIT\_\-STATES}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}}\index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!WAIT_STATES@{WAIT\_\-STATES}}\item[{\em +WAIT\_\-STATES\label{sls__detector__defs_8h_8c326f6a87754392b72098d3d0dec49dce6f5250b9197568ebc442fcf3fa4ad6} +}]wait states for bus read \index{SET_SIGNAL_LENGTH@{SET\_\-SIGNAL\_\-LENGTH}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}}\index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!SET_SIGNAL_LENGTH@{SET\_\-SIGNAL\_\-LENGTH}}\item[{\em +SET\_\-SIGNAL\_\-LENGTH\label{sls__detector__defs_8h_8c326f6a87754392b72098d3d0dec49d93f0483a6f279a444314846e3c4c2699} +}]set/clear signal length \end{description} +\end{Desc} + \index{sls_detector_defs.h@{sls\_\-detector\_\-defs.h}!timerIndex@{timerIndex}} \index{timerIndex@{timerIndex}!sls_detector_defs.h@{sls\_\-detector\_\-defs.h}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}enum \bf{timer\-Index}}\label{sls__detector__defs_8h_07c87ebf35dffccd06fe39859a3ca603} diff --git a/slsDetectorSoftware/docs/latex/structslsDetector_1_1sharedSlsDetector.tex b/slsDetectorSoftware/docs/latex/structslsDetector_1_1sharedSlsDetector.tex index 05f29644c..e51ecab00 100644 --- a/slsDetectorSoftware/docs/latex/structslsDetector_1_1sharedSlsDetector.tex +++ b/slsDetectorSoftware/docs/latex/structslsDetector_1_1sharedSlsDetector.tex @@ -60,12 +60,16 @@ float \bf{t\-Dead} \item int \bf{n\-Bad\-Chans} \item +char \bf{bad\-Chan\-File} [MAX\_\-STR\_\-LENGTH] +\item int \bf{bad\-Chans\-List} [MAX\_\-BADCHANS] \item int \bf{n\-Bad\-FF} \item int \bf{bad\-FFList} [MAX\_\-BADCHANS] \item +char \bf{ang\-Conv\-File} [MAX\_\-STR\_\-LENGTH] +\item \bf{angle\-Conversion\-Constant} \bf{ang\-Off} [MAXMODS] \item int \bf{ang\-Direction} @@ -126,7 +130,12 @@ memory offsets for the adc arrays \index{slsDetector::sharedSlsDetector@{sls\-De \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int \bf{sls\-Detector::shared\-Sls\-Detector::already\-Existing}}\label{structslsDetector_1_1sharedSlsDetector_ee2e81699a79e6b9ddc698d120a13ef9} -already existing flag. If the detector does not yet exist (already\-Existing=0) the shared\-Memory will be created, otherwise it will simly be linked \index{slsDetector::sharedSlsDetector@{sls\-Detector::shared\-Sls\-Detector}!angDirection@{angDirection}} +already existing flag. If the detector does not yet exist (already\-Existing=0) the shared\-Memory will be created, otherwise it will simly be linked \index{slsDetector::sharedSlsDetector@{sls\-Detector::shared\-Sls\-Detector}!angConvFile@{angConvFile}} +\index{angConvFile@{angConvFile}!slsDetector::sharedSlsDetector@{sls\-Detector::shared\-Sls\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}char \bf{sls\-Detector::shared\-Sls\-Detector::ang\-Conv\-File}[MAX\_\-STR\_\-LENGTH]}\label{structslsDetector_1_1sharedSlsDetector_42502564011f831f43733ffed7c2eafd} + + +file with the angular conversion factors \index{slsDetector::sharedSlsDetector@{sls\-Detector::shared\-Sls\-Detector}!angDirection@{angDirection}} \index{angDirection@{angDirection}!slsDetector::sharedSlsDetector@{sls\-Detector::shared\-Sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int \bf{sls\-Detector::shared\-Sls\-Detector::ang\-Direction}}\label{structslsDetector_1_1sharedSlsDetector_289a2fe819a4e02a93dfc54f9ba7ae16} @@ -138,7 +147,12 @@ angular direction (1 if it corresponds to the encoder direction i.e. channel 0 i array of angular conversion constants for each module\begin{Desc} \item[See also:]\doxyref{angle\-Conversion\-Constant}{p.}{structangleConversionConstant} \end{Desc} -\index{slsDetector::sharedSlsDetector@{sls\-Detector::shared\-Sls\-Detector}!badChansList@{badChansList}} +\index{slsDetector::sharedSlsDetector@{sls\-Detector::shared\-Sls\-Detector}!badChanFile@{badChanFile}} +\index{badChanFile@{badChanFile}!slsDetector::sharedSlsDetector@{sls\-Detector::shared\-Sls\-Detector}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}char \bf{sls\-Detector::shared\-Sls\-Detector::bad\-Chan\-File}[MAX\_\-STR\_\-LENGTH]}\label{structslsDetector_1_1sharedSlsDetector_9ab536c77675cd30b26ab647efe5c3ca} + + +file with the bad channels \index{slsDetector::sharedSlsDetector@{sls\-Detector::shared\-Sls\-Detector}!badChansList@{badChansList}} \index{badChansList@{badChansList}!slsDetector::sharedSlsDetector@{sls\-Detector::shared\-Sls\-Detector}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}int \bf{sls\-Detector::shared\-Sls\-Detector::bad\-Chans\-List}[MAX\_\-BADCHANS]}\label{structslsDetector_1_1sharedSlsDetector_4e03ad7a759acf38d4543e0df9ab9710} diff --git a/slsDetectorSoftware/mythenDetector/mythenDetector.cpp b/slsDetectorSoftware/mythenDetector/mythenDetector.cpp index 644bb5f2d..03d62a778 100644 --- a/slsDetectorSoftware/mythenDetector/mythenDetector.cpp +++ b/slsDetectorSoftware/mythenDetector/mythenDetector.cpp @@ -1,8 +1,5 @@ #include "mythenDetector.h" #include "usersFunctions.h" -#include -#include -#include @@ -10,8 +7,1126 @@ using namespace std; -mythenDetector::mythenDetector(int id): slsDetector(MYTHEN,id) - { - ; + + /* detector configuration (no communication to server) */ + + /* + Every detector should have a basic configuration file containing: + type (mythen, pilatus etc.) + hostname + portnumber + communication type (default TCP/IP) + eventually secondary portnumber (e.g. mythen stop function) + number of modules installed if different from the detector size (x,y) + */ + +int mythenDetector::readConfigurationFile(string const fname){ + + char hostname[1000]=DEFAULT_HOSTNAME; + int cport=DEFAULT_PORTNO, sport=DEFAULT_PORTNO+1,dport=-1; + int nmx=-1, nmy=-1; + float angoff=0.; + + + int nnames=17; + string names[]={"Hostname", "NmodX", "NmodY", "Detector", "ControlPort", "StopPort", "DataPort", "TrimBitDir","TrimBitEnergies", "CalDir", "BadChanList", "AngCal", "AngDirection", "FineOffset","GlobalOffset", "ClkDiv","BinSize"}; + char line[500]; + string str; + ifstream infile; + string::size_type pos; + int iargval; + int interrupt=0; + + string sargname, sargval, dtype; + int iarg; + float farg; + int iline=0; + cout << "config file name "<< fname << endl; + infile.open(fname.c_str(), ios_base::in); + if (infile.is_open()) { + while (infile.good() and interrupt==0) { + sargname="none"; + sargval="0"; + getline(infile,str); + iline++; +#ifdef VERBOSE + cout << str << endl; +#endif + if (str.find('#')!=string::npos) { +#ifdef VERBOSE + cout << "Line is a comment " << endl; + cout << str << endl; +#endif + continue; + } else { + istringstream ssstr(str); + ssstr >> sargname; + if (!ssstr.good()) { +#ifdef VERBOSE + cout << "bad stream out" << endl; +#endif + interrupt=1; + break; + } else { + for (int iname=0; iname> sargval; + strcpy(hostname,sargval.c_str()); + break; + case 1: + ssstr>> nmx; + break; + case 2: + ssstr >> nmy; + break; + case 3: + ssstr >> dtype; + break; + case 4: + ssstr >> iargval; + cport=iargval; + break; + case 5: + ssstr >> iargval; + sport=iargval; + break; + case 6: + ssstr >> iargval; + dport=iargval; + break; + case 7: + ssstr>> sargval; + strcpy(thisDetector->trimDir,sargval.c_str()); + break; + case 8: + thisDetector->nTrimEn=0; + while (ssstr.good()) { + ssstr >> farg; + thisDetector->trimEnergies[thisDetector->nTrimEn]=farg; + thisDetector->nTrimEn++; + } + break; + case 9: + ssstr>> sargval; + strcpy(thisDetector->calDir,sargval.c_str()); + break; + case 10: + ssstr>> sargval; + strcpy(thisDetector->badChanFile,sargval.c_str()); + break; + case 11: + ssstr>> sargval; + strcpy(thisDetector->angConvFile,sargval.c_str()); + setAngularConversion(thisDetector->angConvFile); + break; + case 12: + ssstr>> iargval; + thisDetector->angDirection=iargval; + break; + case 13: + ssstr>> farg; + thisDetector->fineOffset=farg; + break; + case 14: + ssstr>> farg; + thisDetector->globalOffset=farg; +#ifdef VERBOSE + cout << "global offset is "<< farg << endl; +#endif + break; + case 15: + ssstr>> iargval; + thisDetector->clkDiv=iargval; +#ifdef VERBOSE + cout << "clock divider is "<< iargval << endl; +#endif + break; + case 16: + ssstr>> farg; + thisDetector->binSize=farg; +#ifdef VERBOSE + cout << "binsize is "<< farg << endl; +#endif + break; + default: + cout << "unknown!" << endl; + } + break; + } + } + } + } + } + infile.close(); + } + else + { + cout << "Error opening configuration file " << fname << " for reading" << endl; + return FAIL; + } + + setTCPSocket(hostname,cport,sport,dport); + setDetectorType(dtype); + setNumberOfModules(nmx,X); + setNumberOfModules(nmy,Y); +#ifdef VERBOSE + cout << "Finished reading configuration file " << endl; +#endif + return OK; +}; + + +int mythenDetector::writeConfigurationFile(string const fname){ + + + string names[]={"Hostname", "NmodX", "NmodY", "Detector", "ControlPort", "StopPort", "DataPort", "TrimBitDir", "TrimBitEnergies","CalDir", "BadChanList", "AngCal", "AngDirection", "AngOffset", "ClkDiv"}; + ofstream outfile; + char hostname[1000]=""; + + + outfile.open (fname.c_str(),ios_base::out); + if (outfile.is_open()) + { + while (outfile.good()) { + if (controlSocket) { + controlSocket->getHostname(hostname); + } + outfile << "Hostname " << hostname << endl; + outfile << "NModX " << setNumberOfModules(GET_FLAG, X) << endl; + outfile << "NModY " << setNumberOfModules(GET_FLAG, Y) << endl; + switch (thisDetector->myDetectorType) { + case MYTHEN: + outfile << "Detector Mythen" << endl; + break; + case PILATUS: + outfile << "Detector Pilatus" << endl; + break; + case EIGER: + outfile << "Detector EIGER" << endl; + break; + case GOTTHARD: + outfile << "Detector Gotthard" << endl; + break; + case AGIPD: + outfile << "Detector Agipd" << endl; + break; + default: + outfile << "Detector Generic" << endl; + break; + + } + if (controlSocket) + outfile << "ControlPort " << controlSocket->getPortNumber() << endl; + if (stopSocket) + outfile << "StopPort " << stopSocket->getPortNumber() << endl; + if (dataSocket) + outfile << "DataPort" << dataSocket->getPortNumber() << endl; + outfile << "TrimBitDir " << thisDetector->trimDir << endl; + outfile << "TrimBitEnergies" ; + for (int ien=0; ien< thisDetector->nTrimEn; ien++) + outfile << " " << thisDetector->trimEnergies[ien]<< endl; + outfile << endl; + outfile << "CalDir " << thisDetector->calDir << endl; + // outfile << "BadChanList " << thisDetector->badChanFile << endl; + //outfile << "AngCal " << thisDetector->angConvFile << endl; + outfile << "AngDirection " << thisDetector->angDirection << endl; + outfile << "FineOffset " << thisDetector->fineOffset<< endl; + outfile << "GlobalOffset " << thisDetector->globalOffset<< endl; + outfile << "ClkDiv " << thisDetector->clkDiv << endl; + } + outfile.close(); + } + else + { + cout << "Error opening configuration file " << fname << " for writing" << endl; + return FAIL; + } + return OK; +}; + /* + It should be possible to dump all the settings of the detector (including trimbits, threshold energy, gating/triggering, acquisition time etc. + in a file and retrieve it for repeating the measurement with identicals ettings, if necessary + */ +/* int mythenDetector::dumpDetectorSetup(string fname){}; + int mythenDetector::retrieveDetectorSetup(string fname){}; +*/ + + + + /* I/O */ + + + sls_detector_module* mythenDetector::readTrimFile(string fname, sls_detector_module *myMod){ + + int nflag=0; + + if (myMod==NULL) { + myMod=createModule(); + nflag=1; + } + string myfname; + string str; + ifstream infile; + ostringstream oss; + int isgood=1; + int iline=0; + string names[]={"Vtrim", "Vthresh", "Rgsh1", "Rgsh2", "Rgpr", "Vcal", "outBuffEnable"}; + string sargname; + int ival; + int ichan=0, ichip=0, idac=0; + + + +#ifdef VERBOSE + cout << "reading trimfile for module number "<< myMod->module << endl; +#endif + //im=myMod->module; + //myMod->module=im; + // myMod->serialnumber=getId(MODULE_SERIAL_NUMBER, im); + // if (im<0) + myfname=fname; + /* else { + // oss << fname << ".sn" << setfill('0') <serialnumber + oss << fname << ".sn" << setfill('0') <module; + myfname=oss.str(); + + }*/ +#ifdef VERBOSE + cout << "trim file name is "<< myfname << endl; +#endif + infile.open(myfname.c_str(), ios_base::in); + if (infile.is_open()) { + // while (infile.good() && isgood==1) { + for (int iarg=0; iargnDacs; iarg++) { + getline(infile,str); + iline++; +#ifdef VERBOSE + // cout << str << endl; +#endif + istringstream ssstr(str); + ssstr >> sargname >> ival; +#ifdef VERBOSE + cout << sargname << " dac nr. " << idac << " is " << ival << endl; +#endif + myMod->dacs[idac]=ival; + idac++; + } + for (ichip=0; ichipnChips; ichip++) { + getline(infile,str); + iline++; +#ifdef VERBOSE + // cout << str << endl; +#endif + istringstream ssstr(str); + ssstr >> sargname >> ival; +#ifdef VERBOSE + // cout << "chip " << ichip << " " << sargname << " is " << ival << endl; +#endif + + myMod->chipregs[ichip]=ival; + for (ichan=0; ichannChans; ichan++) { + getline(infile,str); +#ifdef VERBOSE + // cout << str << endl; +#endif + istringstream ssstr(str); + +#ifdef VERBOSE + // cout << "channel " << ichan+ichip*thisDetector->nChans <<" iline " << iline<< endl; +#endif + iline++; + myMod->chanregs[ichip*thisDetector->nChans+ichan]=0; + for (int iarg=0; iarg<6 ; iarg++) { + ssstr >> ival; + //if (ssstr.good()) { + switch (iarg) { + case 0: +#ifdef VERBOSE + // cout << "trimbits " << ival ; +#endif + myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival&0x3f; + break; + case 1: +#ifdef VERBOSE + //cout << " compen " << ival ; +#endif + myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival<<9; + break; + case 2: +#ifdef VERBOSE + //cout << " anen " << ival ; +#endif + myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival<<8; + break; + case 3: +#ifdef VERBOSE + //cout << " calen " << ival ; +#endif + myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival<<7; + break; + case 4: +#ifdef VERBOSE + //cout << " outcomp " << ival ; +#endif + myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival<<10; + break; + case 5: +#ifdef VERBOSE + //cout << " counts " << ival << endl; +#endif + myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival<<11; + break; + default: + cout << " too many columns" << endl; + break; + } + } + } + // } + } +#ifdef VERBOSE + cout << "read " << ichan*ichip << " channels" <nChans; ichan++) { + iv=mod.chanregs[ichip*thisDetector->nChans+ichan]; + iv1= (iv&0x3f); + outfile <>nb); + outfile << iv1 << " "; + nb=8; + iv1=((iv&(1<>nb); + outfile << iv1 << " "; + nb=7; + iv1=((iv&(1<>nb); + outfile <>nb); + outfile << iv1 << " "; + nb=11; + iv1= ((iv&0xfffff800)>>nb); + outfile << iv1 << endl; + } + } + outfile.close(); + return OK; + } else { + cout << "could not open file " << fname << endl; + return FAIL; + } + +}; + + + + +int mythenDetector::writeTrimFile(string fname, int imod){ + + return writeTrimFile(fname,detectorModules[imod]); + +}; + + +int mythenDetector::writeDataFile(string fname, float *data, float *err, float *ang, char dataformat, int nch){ + if (nch==-1) + nch=thisDetector->nChans*thisDetector->nChips*thisDetector->nMods; + + + ofstream outfile; + int idata; + if (data==NULL) + return FAIL; +#ifdef VERBOSE + cout << "writing data to file " << fname << endl; +#endif + // args|=0x10; // one line per channel! + + outfile.open (fname.c_str(),ios_base::out); + if (outfile.is_open()) + { +#ifdef VERBOSE + cout << "Writing to file " << fname << endl; +#endif + for (int ichan=0; ichannChans*thisDetector->nChips*thisDetector->nMods; ichan++) + outfile << ichan << " " << *(data+ichan) << endl; + outfile.close(); + return OK; + } else { + cout << "Could not open file " << fname << "for writing"<< endl; + return FAIL; + } +}; + + + + + +int mythenDetector::readDataFile(string fname, float *data, float *err, float *ang, char dataformat, int nch){ + + + ifstream infile; + int ichan, iline=0; + int interrupt=0; + float fdata, ferr, fang; + int maxchans; + int ich; + string str; + + if (nch==0) + maxchans=thisDetector->nChans*thisDetector->nChips*thisDetector->nMods; + else if (nch<0) + maxchans=0xfffffff; + else + maxchans=nch; + +#ifdef VERBOSE + cout << "Opening file "<< fname << endl; +#endif + infile.open(fname.c_str(), ios_base::in); + if (infile.is_open()) { + while (infile.good() and interrupt==0) { + getline(infile,str); +#ifdef VERBOSE + cout << str << endl; +#endif + istringstream ssstr(str); + if (ang==NULL) { + ssstr >> ichan >> fdata; + ich=ichan; + if (ich!=iline) + cout << "Channel number " << ichan << " does not match with line number " << iline << endl; + } else { + ssstr >> fang >> fdata; + ich=iline; + } + if (!ssstr.good()) { + interrupt=1; + break; + } + if (err) + ssstr >> ferr; + if (!ssstr.good()) { + interrupt=1; + break; + } + if (ich> ichan >> idata; + if (!ssstr.good()) { + interrupt=1; + break; + } + if (ichan!=iline) { + cout << " Expected channel "<< iline <<" but read channel "<< ichan << endl; + interrupt=1; + break; + } else { + if (ilinenChans*thisDetector->nChips*thisDetector->nMods) { + data[iline]=idata; + iline++; + } else { + interrupt=1; + break; + } + } + } + } else { + cout << "Could not read file " << fname << endl; + return -1; + } + return iline; +}; + + + + +int mythenDetector::readCalibrationFile(string fname, float &gain, float &offset){ + + char line[500]; + string str; + ifstream infile; +#ifdef VERBOSE + cout << "Opening file "<< fname << endl; +#endif + infile.open(fname.c_str(), ios_base::in); + if (infile.is_open()) { + getline(infile,str); +#ifdef VERBOSE + cout << str << endl; +#endif + istringstream ssstr(str); + ssstr >> offset >> gain; + } else { + cout << "Could not open calibration file "<< fname << endl; + gain=0.; + offset=0.; + return -1; + } + return 0; +}; +/* +int mythenDetector::writeCalibrationFile(string fname, float gain, float offset){}; +*/ + /* Communication to server */ + + + + // calibration functions +/* + really needed? + +int mythenDetector::setCalibration(int imod, detectorSettings isettings, float gain, float offset){ + cout << "function not yet implemented " << endl; + + + + return OK; + +} +int mythenDetector::getCalibration(int imod, detectorSettings isettings, float &gain, float &offset){ + + cout << "function not yet implemented " << endl; + + + +} +*/ + +/* + +int mythenDetector::setROI(int nroi, int *xmin, int *xmax, int *ymin, int *ymax){ + + +}; +*/ + +//Corrections + +int mythenDetector::setAngularConversion(string fname) { + if (fname=="") { + thisDetector->correctionMask&=~(1<< ANGULAR_CONVERSION); + } else { + if (fname=="default") + fname=thisDetector->angConvFile; + if (readAngularConversion(fname)>=0) { + thisDetector->correctionMask|=(1<< ANGULAR_CONVERSION); + strcpy(thisDetector->angConvFile,fname.c_str()); + } + } + return thisDetector->correctionMask&(1<< ANGULAR_CONVERSION); } +int mythenDetector::getAngularConversion(int &direction, angleConversionConstant *angconv) { + direction=thisDetector->angDirection; + if (angconv) { + for (int imod=0; imodnMods; imod++) { + (angconv+imod)->center=thisDetector->angOff[imod].center; + (angconv+imod)->r_conversion=thisDetector->angOff[imod].r_conversion; + (angconv+imod)->offset=thisDetector->angOff[imod].offset; + (angconv+imod)->ecenter=thisDetector->angOff[imod].ecenter; + (angconv+imod)->er_conversion=thisDetector->angOff[imod].er_conversion; + (angconv+imod)->eoffset=thisDetector->angOff[imod].eoffset; + } + } + if (thisDetector->correctionMask&(1<< ANGULAR_CONVERSION)) { + return 1; + } else { + return 0; + } + +} + + + +int mythenDetector::readAngularConversion(string fname) { + char line[500]; + string str; + ifstream infile; + int mod; + float center, ecenter; + float r_conv, er_conv; + float off, eoff; + string ss; + int interrupt=0; + + //" module %i center %E +- %E conversion %E +- %E offset %f +- %f \n" +#ifdef VERBOSE + cout << "Opening file "<< fname << endl; +#endif + infile.open(fname.c_str(), ios_base::in); + if (infile.is_open()) { + while (infile.good() and interrupt==0) { + getline(infile,str); +#ifdef VERBOSE + cout << str << endl; +#endif + istringstream ssstr(str); + ssstr >> ss >> mod; + ssstr >> ss >> center; + ssstr >> ss >> ecenter; + ssstr >> ss >> r_conv; + ssstr >> ss >> er_conv; + ssstr >> ss >> off; + ssstr >> ss >> eoff; + if (modnModsMax && mod>=0) { + thisDetector->angOff[mod].center=center; + thisDetector->angOff[mod].r_conversion=r_conv; + thisDetector->angOff[mod].offset=off; + thisDetector->angOff[mod].ecenter=ecenter; + thisDetector->angOff[mod].er_conversion=er_conv; + thisDetector->angOff[mod].eoffset=eoff; + } + } + } else { + cout << "Could not open calibration file "<< fname << endl; + return -1; + } + return 0; +} + + +int mythenDetector:: writeAngularConversion(string fname) { + ofstream outfile; + outfile.open (fname.c_str(),ios_base::out); + if (outfile.is_open()) + { + for (int imod=0; imodnMods; imod++) { + outfile << " module " << imod << " center "<< thisDetector->angOff[imod].center<<" +- "<< thisDetector->angOff[imod].ecenter<<" conversion "<< thisDetector->angOff[imod].r_conversion << " +- "<< thisDetector->angOff[imod].er_conversion << " offset "<< thisDetector->angOff[imod].offset << " +- "<< thisDetector->angOff[imod].eoffset << endl; + } + outfile.close(); + } else { + cout << "Could not open file " << fname << "for writing"<< endl; + return -1; + } + //" module %i center %E +- %E conversion %E +- %E offset %f +- %f \n" + return 0; +} + +int mythenDetector::resetMerging(float *mp, float *mv, float *me, int *mm) { + + float binsize; + if (thisDetector->binSize>0) + binsize=thisDetector->binSize; + else + return FAIL; + + for (int ibin=0; ibin<(360./binsize); ibin++) { + mp[ibin]=0; + mv[ibin]=0; + me[ibin]=0; + mm[ibin]=0; + } + return OK; +} + + +int mythenDetector::finalizeMerging(float *mp, float *mv, float *me, int *mm) { + float binsize; + int np=0; + + if (thisDetector->binSize>0) + binsize=thisDetector->binSize; + else + return FAIL; + + for (int ibin=0; ibin<(360./binsize); ibin++) { + if (mm[ibin]>0) { + mp[np]=mp[ibin]/mm[ibin]; + mv[np]=mv[ibin]/mm[ibin]; + me[np]=me[ibin]/mm[ibin]; + me[np]=sqrt(me[ibin]); + mm[np]=mm[ibin]; + np++; + } + } + return OK; +} + +int mythenDetector::addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv,float *me, int *mm) { + + float binsize; + float binmi=-180., binma; + int ibin=0; + int imod; + float ang; + + if (thisDetector->binSize>0) + binsize=thisDetector->binSize; + else + return FAIL; + binmi=-180.; + binma=binmi+binsize; + + + if (thisDetector->angDirection>0) { + for (int ip=0; ipnChans*thisDetector->nChips*thisDetector->nMods; ip++) { + if (thisDetector->correctionMask&DISCARD_BAD_CHANNELS) { + if (badChannelMask[ip]) + continue; + } + imod=ip/(thisDetector->nChans*thisDetector->nChips); + if (p1) + ang=p1[ip]; + else + ang=angle(ip,currentPosition,thisDetector->fineOffset+thisDetector->globalOffset,thisDetector->angOff[imod].r_conversion,thisDetector->angOff[imod].center, thisDetector->angOff[imod].offset,thisDetector->angOff[imod].tilt,thisDetector->angDirection); + + + + while (binmanChans*thisDetector->nChips*thisDetector->nMods-1; ip>=0; ip--) { + if (thisDetector->correctionMask&(1<< DISCARD_BAD_CHANNELS)) { + if (badChannelMask[ip]) + continue; + } + + while (binmanumberOfPositions>0) + np=thisDetector->numberOfPositions; + + currentPositionIndex=0; + + for (int ip=0; ipnumberOfPositions>0) { + go_to_position (thisDetector->detPositions[ip]); + currentPositionIndex=ip+1; + } + //write header before? + startAndReadAll(); + if (thisDetector->correctionMask&(1<< I0_NORMALIZATION)) + currentI0=get_i0(); + //write header after? + if (thisDetector->correctionMask&(1<< ANGULAR_CONVERSION)) + currentPosition=get_position(); + + processData(); + } +} + + +void* mythenDetector::processData() { + + + int *myData; + float *fdata; + // float *dataout=new float[thisDetector->nChans*thisDetector->nChips*thisDetector->nMods]; + float *rcdata=NULL, *rcerr=NULL; + float *ffcdata=NULL, *ffcerr=NULL; + float *ang=NULL; + float bs=0.004; + int i=0; + int imod; + int nb; + int np; + while(1) { + + + if( !dataQueue.empty() ) { + + /** Pop data queue */ + myData=dataQueue.front(); // get the data from the queue + dataQueue.pop(); //remove the data from the queue + if (myData) { + //process data + + /** decode data */ + fdata=decodeData(myData); + + delete [] myData; + myData=NULL; + /** write raw data file */ + writeDataFile (createFileName().append(".raw"), fdata, NULL, NULL, 'i'); + + /** rate correction */ + if (thisDetector->correctionMask&(1<nChans*thisDetector->nChips*thisDetector->nMods]; + rcerr=new float[thisDetector->nChans*thisDetector->nChips*thisDetector->nMods]; + rateCorrect(fdata,NULL,rcdata,rcerr); + delete [] fdata; + } else { + rcdata=fdata; + fdata=NULL; + } + + /** flat field correction */ + if (thisDetector->correctionMask&(1<nChans*thisDetector->nChips*thisDetector->nMods]; + ffcerr=new float[thisDetector->nChans*thisDetector->nChips*thisDetector->nMods]; + flatFieldCorrect(rcdata,rcerr,ffcdata,ffcerr); + delete [] rcdata; + delete [] rcerr; + } else { + ffcdata=rcdata; + ffcerr=rcerr; + rcdata=NULL; + rcerr=NULL; + } + + if (thisDetector->correctionMask&(1<< ANGULAR_CONVERSION)) { + + /** angular conversion */ + /** data merging */ + // if (thisDetector->numberOfPositions) { + + if (currentPositionIndex<=1) { + if (thisDetector->binSize>0) + bs=thisDetector->binSize; + else if (thisDetector->angOff[0].r_conversion>0) { + bs=180./PI*atan(thisDetector->angOff[0].r_conversion); + thisDetector->binSize=bs; + } else + thisDetector->binSize=bs; + + + nb=360./bs; + + mergingBins=new float[nb]; + mergingCounts=new float[nb]; + mergingErrors=new float[nb]; + mergingMultiplicity=new int[nb]; + + resetMerging(mergingBins, mergingCounts,mergingErrors, mergingMultiplicity); + } + addToMerging(ang, ffcdata, ffcerr, mergingBins, mergingCounts,mergingErrors, mergingMultiplicity); + + ang=new float[thisDetector->nChans*thisDetector->nChips*thisDetector->nMods]; + for (int ip=0; ipnChans*thisDetector->nChips*thisDetector->nMods; ip++) { + imod=ip/(thisDetector->nChans*thisDetector->nChips); + ang[ip]=angle(ip,currentPosition,thisDetector->fineOffset+thisDetector->globalOffset,thisDetector->angOff[imod].r_conversion,thisDetector->angOff[imod].center, thisDetector->angOff[imod].offset,thisDetector->angOff[imod].tilt,thisDetector->angDirection); + } + writeDataFile (createFileName().append(".dat"), ffcdata, ffcerr,ang); + if (currentPositionIndex==thisDetector->numberOfPositions || (currentPositionIndex==0) { + + np=finalizeMerging(mergingBins, mergingCounts,mergingErrors, mergingMultiplicity); + + /** file writing */ + currentPositionIndex++; + writeDataFile (createFileName().append(".dat"),mergingCounts, mergingErrors, mergingBins,'f',np); + + delete [] mergingBins; + delete [] mergingCounts; + delete [] mergingErrors; + delete [] mergingMultiplicity; + thisDetector->fileIndex++; + + } + //} + + } else { + writeDataFile (createFileName().append(".dat"), ffcdata, ffcerr); + thisDetector->fileIndex++; + } + + if (ffcdata) + delete [] ffcdata; + if (ffcerr) + delete [] ffcerr; + if (ang) + delete [] ang; + + } + } + } +} + + +/* +void mythenDetector::startThread() { + pthread_attr_t tattr, mattr; + int ret; + int newprio; + sched_param param, mparam; + void *arg; + int policy= SCHED_OTHER; + + ret = pthread_attr_init(&tattr); + + // set the priority; others are unchanged + //newprio = 30; + mparam.sched_priority = 30; + // scheduling parameters of main thread + ret = pthread_setschedparam(pthread_self(), policy, &mparam); + + + printf("current priority is %d\n",param.sched_priority); + ret = pthread_create(&dataProcessingThread, NULL,startProcessData, (void*)this); + + + param.sched_priority = 1; + // scheduling parameters of target thread + ret = pthread_setschedparam(dataProcessingThread, policy, ¶m); + + +} + +void* startProcessData(void *n) { + + //void* processData(void *n) { + void *w; + mythenDetector *myDet=(mythenDetector*)n; + myDet->processData(0); +} +*/ diff --git a/slsDetectorSoftware/mythenDetector/mythenDetector.h b/slsDetectorSoftware/mythenDetector/mythenDetector.h index a1c4281f4..0ddfb9324 100644 --- a/slsDetectorSoftware/mythenDetector/mythenDetector.h +++ b/slsDetectorSoftware/mythenDetector/mythenDetector.h @@ -4,43 +4,70 @@ #ifndef MYTHEN_DETECTOR_H #define MYTHEN_DETECTOR_H -using namespace std; - - - -/** - * - * -@libdoc The mythenDetector class contains the functions specific to the mythen detector - * - * @short This calss contains all mythen specific functions - * @author Anna Bergamaschi - * @version 0.1alpha (any string) - - - */ #include "slsDetector.h" +#define defaultTDead {170,90,750} + +using namespace std; +/** + \mainpage C++ class with MYTHEN specific functions + * + + + @author Anna Bergamaschi + +*/ + + + class mythenDetector : public slsDetector{ public: - - - -/** (default) constructor - - \param id is the detector index which is needed to define the shared memory id. Different physical detectors should have different IDs in order to work independently - - +/** + (default) constructor */ - mythenDetector(int id=0); + mythenDetector(int id=0) : slsDetector(MYTHEN, id); //slsDetector(string const fname); + // ~slsDetector(){while(dataQueue.size()>0){}}; /** destructor */ ~mythenDetector(){}; + int readConfigurationFile(string const fname); + /** + Every detector should have a basic configuration file containing: + type (mythen, pilatus etc.) + hostname + portnumber + communication type (default TCP/IP) + eventually secondary portnumber (e.g. mythen stop function) + number of modules installed if different from the detector size (x,y) + + to be changed + */ + int writeConfigurationFile(string const fname); + + + /* + It should be possible to dump all the settings of the detector (including trimbits, threshold energy, gating/triggering, acquisition time etc. + in a file and retrieve it for repeating the measurement with identicals ettings, if necessary + */ + /** + not yet implemented + + should dump to a file all the current detector parameters + */ + int dumpDetectorSetup(string const fname); + /** + not yet implemented + + should retrieve from a file all the current detector parameters + */ + int retrieveDetectorSetup(string const fname); + + /** reads a trim file @@ -70,7 +97,6 @@ class mythenDetector : public slsDetector{ */ int writeTrimFile(string fname, int imod); - /** writes a data file \param name of the file to be written @@ -117,20 +143,15 @@ class mythenDetector : public slsDetector{ */ int readDataFile(string fname, int *data); - /** - returns the location of the calibration files - \sa sharedSlsDetector - */ /** - int readCalibrationFile(string fname, float &gain, float &offset); + reads a calibration file \param fname file to be read \param gain reference to the gain variable \offset reference to the offset variable \sa sharedSlsDetector */ int readCalibrationFile(string fname, float &gain, float &offset); - /** writes a clibration file \param fname file to be written @@ -153,12 +174,12 @@ class mythenDetector : public slsDetector{ \sa angleConversionConstant */ int writeAngularConversion(string fname=""); - - /* Communication to server */ - // Tests and identification + + //Corrections + /** set angular conversion @@ -175,6 +196,10 @@ class mythenDetector : public slsDetector{ */ int getAngularConversion(int &direction, angleConversionConstant *angconv=NULL); + + /** returns the angular conversion file */ + char *getAngularConversion() {return thisDetector->angConvFile;}; + /** set detector global offset */ @@ -216,21 +241,16 @@ class mythenDetector : public slsDetector{ - - - - /** - decode data from the detector converting them to an array of floats, one for each channle - \param datain data from the detector - \returns pointer to a float array with a data per channel + + /** sets the arrays of the merged data to 0. NB The array should be created with size >= 360./getBinSize(); + \param mp already merged postions + \param mv already merged data + \param me already merged errors (squared sum) + \param mm multiplicity of merged arrays + \returns OK or FAIL */ - float* decodeData(int *datain); - - - int resetMerging(float *mp, float *mv,float *me, int *mm); - /** not yet implemented - merge dataset + /** merge dataset \param p1 angular positions of dataset \param v1 data \param e1 errors @@ -251,10 +271,22 @@ class mythenDetector : public slsDetector{ */ int finalizeMerging(float *mp, float *mv,float *me, int *mm); - - private: - + /** + function for processing data + */ + void* processData(); // thread function + + /** performs the complete acquisition and data processing + moves the detector to next position
    + starts and reads the detector
    + reads the IC (if required)
    + reads the encoder (iof required for angualr conversion)
    + processes the data (flat field, rate, angular conversion and merging ::processData()) + */ + + void acquire(); + }; diff --git a/slsDetectorSoftware/mythenDetectorServer/Makefile b/slsDetectorSoftware/mythenDetectorServer/Makefile index 63658adc5..94e7ef09d 100755 --- a/slsDetectorSoftware/mythenDetectorServer/Makefile +++ b/slsDetectorSoftware/mythenDetectorServer/Makefile @@ -13,8 +13,8 @@ INSTMODE= 0777 SRCS= server.c server_funcs.c communication_funcs.c firmware_funcs.c mcb_funcs.c trimming_funcs.c sharedmemory.c OBJS= $(SRCS:%.c=%.o) -CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -# -DVERBOSE +CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -DVERBOSE +# -DVERYVERBOSE #-Werror LDLIBS+= -lm @@ -25,7 +25,7 @@ boot: $(OBJS) $(PROGS): $(OBJS) echo $(OBJS) - $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ + $(CC) $(LDFLAGS) $^ $(LDLIBS) $(CFLAGS) -o $@ install: $(PROGS) $(INSTALL) -d $(INSTDIR) diff --git a/slsDetectorSoftware/mythenDetectorServer/firmware_funcs.c b/slsDetectorSoftware/mythenDetectorServer/firmware_funcs.c index 40c8f706b..2a44ef11e 100755 --- a/slsDetectorSoftware/mythenDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/mythenDetectorServer/firmware_funcs.c @@ -179,7 +179,7 @@ u_int32_t setWaitStates(int d1) { u_int32_t c; int d=d1-2; char cmd[100]; - sprintf(cmd,"bus -a 0xb0000000 -w 0xd000%1x",d1); + sprintf(cmd,"bus -a 0xb0000000 -w 0x%x0008",d1); c=bus_r(SPEED_REG); bus_w(SPEED_REG,(d<>ichan)&0xf; dataout[ichan]=(iptr>>(ipos))&0x1; ichan++; } @@ -709,7 +727,6 @@ u_int32_t* decode_data(int *datain) for (ibyte=0; ibyte>ichan)&0xf; dataout[ichan]=(iptr>>(ipos*4))&0xf; ichan++; } @@ -731,7 +748,7 @@ u_int32_t* decode_data(int *datain) break; default: for (ichan=0; ichan0) { if (dr<=1) { dynamicRange=1; @@ -850,20 +861,31 @@ int setStoreInRAM(int b) { int allocateRAM() { size_t size; - + u_int32_t nt, nf; + nt=setTrains(-1); + nf=setFrames(-1); + if (nt==0) nt=1; + if (nf==0) nf=1; // ret=clearRAM(); if (storeInRAM) { - size=dataBytes*setFrames(-1); -#ifdef VERBOSE - // printf("nmodx=%d nmody=%d dynamicRange=%d dataBytes=%d nFrames=%d size=%d\n",nModX,nModY,dynamicRange,dataBytes,setFrameNumber(-1),size ); -#endif + size=dataBytes*nf*nt; if (sizemodule=imod; (detectorModules+imod)->gain=0; (detectorModules+imod)->offset=0; + (detectorModules+imod)->reg=0; /* initialize registers, dacs, retrieve sn, adc values etc */ } thisSettings=UNINITIALIZED; @@ -89,7 +92,9 @@ int initDetector() { putout("0000000000000000",ALLMOD); /* initialize dynamic range etc. */ - nModX=n; + nModX=n; + dataBytes=nModX*NCHIP*NCHAN*4; + dynamicRange=32; initChip(0, 1,ALLMOD); // allocateRAM(); @@ -135,13 +140,24 @@ int copyModule(sls_detector_module *destMod, sls_detector_module *srcMod) { int ichip, idac, ichan, iadc; - int ret=FAIL; - if (srcMod->module>=0) - destMod->module=srcMod->module; + int ret=OK; - if (srcMod->serialnumber>=0) +#ifdef VERBOSE + printf("Copying module %x to module %x\n",srcMod,destMod); +#endif + + if (srcMod->module>=0) { +#ifdef VERBOSE + printf("Copying module number %d to module number %d\n",srcMod->module,destMod->module); +#endif + destMod->module=srcMod->module; + } + if (srcMod->serialnumber>=0){ +/* #ifdef VERBOSE */ +/* printf("Copying module serial number %x to module serial number %x\n",srcMod->serialnumber,destMod->serialnumber); */ +/* #endif */ destMod->serialnumber=srcMod->serialnumber; - + } if ((srcMod->nchip)>(destMod->nchip)) { printf("Number of chip of source is larger than number of chips of destination\n"); return FAIL; @@ -158,13 +174,26 @@ int copyModule(sls_detector_module *destMod, sls_detector_module *srcMod) { printf("Number of dacs of source is larger than number of dacs of destination\n"); return FAIL; } + +#ifdef VERBOSE + printf("DACs: src %d, dest %d\n",srcMod->ndac,destMod->ndac); + printf("ADCs: src %d, dest %d\n",srcMod->nadc,destMod->nadc); + printf("Chips: src %d, dest %d\n",srcMod->nchip,destMod->nchip); + printf("Chans: src %d, dest %d\n",srcMod->nchan,destMod->nchan); + +#endif + + + destMod->ndac=srcMod->ndac; destMod->nadc=srcMod->nadc; destMod->nchip=srcMod->nchip; destMod->nchan=srcMod->nchan; if (srcMod->reg>=0) destMod->reg=srcMod->reg; - +#ifdef VERBOSE + printf("Copying register %x (%x)\n",destMod->reg,srcMod->reg ); +#endif if (srcMod->gain>=0) destMod->gain=srcMod->gain; if (srcMod->offset>=0) @@ -188,7 +217,6 @@ int copyModule(sls_detector_module *destMod, sls_detector_module *srcMod) { if (*((srcMod->adcs)+iadc)>=0) *((destMod->adcs)+iadc)=*((srcMod->adcs)+iadc); } - return ret; } @@ -440,13 +468,13 @@ int program_one_dac(int addr, int value, int imod) { // myMod=detectorModules+imod; //(detectorModules+imod)->dacs[idac]=v; #ifdef VERBOSE - printf("module=%d index=%d, val=%d\n",imod, idac, v); + printf("module=%d index=%d, val=%d addr=%x\n",imod, idac, v, detectorDacs+idac+NDAC*imod); #endif detectorDacs[idac+NDAC*imod]=v; } else if (imod==ALLMOD) { for (im=0; imdacs[idac]=v; @@ -642,10 +670,12 @@ int setThresholdEnergy(int ethr) { float getDACbyIndexDACU(int ind, int imod) { - if (detectorDacs) - return (detectorDacs[ind+imod*NDAC]); - else - return FAIL; + if (detectorDacs) { + if (imodndac) + return (detectorDacs[ind+imod*NDAC]); + } + return FAIL; } @@ -725,9 +755,9 @@ int setSettings(int i) { v[RGPR]=rgpr[i]; v[RGSH1]=rgsh1[i]; v[RGSH2]=rgsh2[i]; - break; initDACs(v,ALLMOD); thisSettings=i; + break; default: break; } @@ -743,13 +773,19 @@ int setSettings(int i) { isett=is; } } - for (imod=1; imodchip; ichan=myChan->chan; - if (detectorChans) - myChan->reg=detectorChans[imod*NCHAN*NCHIP+ichip*NCHAN+ichan]; - else - return FAIL; - return OK; + if (detectorChans) { + if (imodnchip && ichan<(detectorModules+imod)->nchan/(detectorModules+imod)->nchip) + myChan->reg=detectorChans[imod*NCHAN*NCHIP+ichip*NCHAN+ichan]; + return OK; + } + } + return FAIL; } + int getTrimbit(int imod, int ichip, int ichan) { - if (detectorChans) - return (detectorChans[imod*NCHAN*NCHIP+ichip*NCHAN+ichan] & TRIM_DR); - else + if (detectorChans) { + if (imodnchip && ichan<(detectorModules+imod)->nchan/(detectorModules+imod)->nchip) + return (detectorChans[imod*NCHAN*NCHIP+ichip*NCHAN+ichan] & TRIM_DR); + } else return -1; } @@ -875,10 +917,12 @@ int initChannel(int ft,int cae, int ae, int coe, int ocoe, int counts, int imod) for (im=modmi; imchip; if (detectorChips) { - myChip->reg=detectorChips[ichip+imod*NCHIP]; - myChip->nchan=NCHAN; - myChip->chanregs=detectorChans+imod*NCHAN*NCHIP+ichip*NCHIP; + if (imodnchip) { + myChip->reg=detectorChips[ichip+imod*NCHIP]; + myChip->nchan=NCHAN; + myChip->chanregs=detectorChans+imod*NCHAN*NCHIP+ichip*NCHIP; + return OK; + } } - return OK; + return FAIL; } @@ -1208,9 +1256,9 @@ int initChip(int obe, int ow,int imod){ for (ichip=chipmi; ichip-2) { - sprintf(mess,"no data and run stopped: %d frames left\n",getFrames()+2); - } else { - strcpy(mess,"acquisition successfully finished\n"); - } + dataret=FAIL; + sprintf(mess,"no data and run stopped: %d frames left\n",getFrames()+2); #ifdef VERBOSE - printf(mess); + printf("%s\n",mess); #endif - sendDataOnly(mess,sizeof(mess)); -#ifdef VERBOSE + } else { + dataret=FINISHED; + sprintf(mess,"acquisition successfully finished\n"); + } +#ifdef VERYVERBOSE + printf("%d %d %x %s\n",strlen(mess)+1,strlen(mess), mess,mess); +#endif + sendDataOnly(&dataret,sizeof(dataret)); + sendDataOnly(mess,strlen(mess)+1);//sizeof(mess)); +#ifdef VERYVERBOSE printf("message sent\n",mess); #endif return dataret; @@ -1663,20 +1671,24 @@ int read_frame(int fnum) { #endif for (iframes=0; iframes-2) + if (getFrames()>-2) { + dataret=FAIL; sprintf(mess,"no data and run stopped: %d frames left\n",getFrames()+2); - else + } else { + dataret=FINISHED; sprintf(mess,"acquisition successfully finished\n"); - + } #ifdef VERBOSE printf("Frames left %d\n",getFrames()); #endif - dataret=FAIL; sendDataOnly(&dataret,sizeof(dataret)); - sendDataOnly(mess,sizeof(mess)); + sendDataOnly(mess,strlen(mess)+1); return dataret; } @@ -1719,7 +1731,7 @@ int start_and_read_all(int fnum) { if (ret!=OK) { sprintf(mess,"could not start state machine\n"); sendDataOnly(&ret,sizeof(ret)); - sendDataOnly(mess,sizeof(mess)); + sendDataOnly(mess,strlen(mess)+1); #ifdef VERBOSE printf("could not start state machine\n"); @@ -1747,7 +1759,6 @@ int set_timer(int fnum) { sprintf(mess,"can't set timer\n"); - n = receiveDataOnly(&ind,sizeof(ind)); if (n < 0) { sprintf(mess,"Error reading from socket\n"); @@ -1760,6 +1771,9 @@ int set_timer(int fnum) { ret=FAIL; } + if (ret!=OK) { + printf(mess); + } #ifdef VERBOSE printf("setting timer %d to %lld ns\n",ind,tns); @@ -1792,15 +1806,18 @@ int set_timer(int fnum) { sprintf(mess,"timer index unknown %d\n",ind); } } - - if (tns>=0 && retval!=tns && (retval+1)!=tns) { - printf("wrote %lld, read %lld\n",tns,retval); - ret=FAIL; - } if (ret!=OK) { + printf(mess); + } + //if (tns>=0 && retval!=tns && (retval+1)!=tns) { + // printf("wrote %lld, read %lld\n",tns,retval); + // ret=FAIL; + // } + if (ret!=OK) { + printf(mess); printf("set timer failed\n"); sprintf(mess, "set timer %d failed\n", ind); - } else if (ind==FRAME_NUMBER){ + } else if (ind==FRAME_NUMBER) { ret=allocateRAM(); if (ret!=OK) sprintf(mess, "could not allocate RAM for %lld frames\n", tns); @@ -1812,7 +1829,7 @@ int set_timer(int fnum) { printf("returning error\n"); #endif - n = sendDataOnly(mess,sizeof(mess)); + n = sendDataOnly(mess,strlen(mess)+1); } else { #ifdef VERBOSE printf("returning ok %d\n",sizeof(retval)); @@ -1888,7 +1905,7 @@ int get_time_left(int fnum) { n = sendDataOnly(&ret,sizeof(ret)); if (ret!=OK) { - n += sendDataOnly(mess,sizeof(mess)); + n += sendDataOnly(mess,strlen(mess)+1); } else { n = sendDataOnly(&retval,sizeof(retval)); } @@ -1963,7 +1980,7 @@ int set_dynamic_range(int fnum) { n = sendDataOnly(&ret,sizeof(ret)); if (ret!=OK) { - n = sendDataOnly(mess,sizeof(mess)); + n = sendDataOnly(mess,strlen(mess)+1); } else { n = sendDataOnly(&retval,sizeof(retval)); } @@ -2004,8 +2021,8 @@ int set_readout_flags(int fnum) { printf("setting readout flags to %d\n",arg); #endif - ret=setStoreInRAM(0); - initChipWithProbes(0,0,0, ALLMOD); + //ret=setStoreInRAM(0); + // initChipWithProbes(0,0,0, ALLMOD); switch(arg) { case STORE_IN_RAM: ret=setStoreInRAM(1); @@ -2013,10 +2030,9 @@ int set_readout_flags(int fnum) { case PUMP_PROBE_MODE: //set number of probes initChipWithProbes(0,0,2, ALLMOD); - // setExtSignal(0,GATE_IN_ACTIVE_HIGH); - // setExtSignal(0,TRIGGER_IN_RISING_EDGE); break; default: + ret=setStoreInRAM(0); ret=OK; } if (storeInRAM) @@ -2032,7 +2048,7 @@ int set_readout_flags(int fnum) { } n = sendDataOnly(&ret,sizeof(ret)); if (ret!=OK) { - n = sendDataOnly(mess,sizeof(mess)); + n = sendDataOnly(mess,strlen(mess)+1); } else { n = sendDataOnly(&retval,sizeof(retval)); } @@ -2115,7 +2131,7 @@ int execute_trimming(int fnum) { } n = sendDataOnly(&ret,sizeof(ret)); if (ret!=OK) { - n = sendDataOnly(mess,sizeof(mess)); + n = sendDataOnly(mess,strlen(mess)+1); } return ret; diff --git a/slsDetectorSoftware/mythenDetectorServer/trimming_funcs.c b/slsDetectorSoftware/mythenDetectorServer/trimming_funcs.c index 5af595352..e9d6f31e2 100755 --- a/slsDetectorSoftware/mythenDetectorServer/trimming_funcs.c +++ b/slsDetectorSoftware/mythenDetectorServer/trimming_funcs.c @@ -164,7 +164,7 @@ int choose_vthresh_and_vtrim(int countlim, int nsigma, int im) { int *trim; int ich, imod, ichan; int nvalid=0; - int *scan; + u_int32_t *scan; int ithr; @@ -307,7 +307,8 @@ int choose_vthresh_and_vtrim(int countlim, int nsigma, int im) { int trim_with_level(int countlim, int im) { int ich, itrim, ichan, ichip, imod; - int *scan, *inttrim; + u_int32_t *scan; + int *inttrim; int modma, modmi, nm; int retval=OK; @@ -349,12 +350,15 @@ int trim_with_level(int countlim, int im) { for (imod=modmi; imodcountlim){ - if (inttrim[ich]==-1) { + if (inttrim[ich]==-1) { + if (scan[ich]>countlim){ inttrim[ich]=itrim; + if (scan[ich]>2*countlim || itrim==0) { #ifdef VERBOSE printf("Channel %d trimbit %d counted %d countlim %d\n",ich,itrim,scan[ich],countlim); #endif + inttrim[ich]=itrim-1; + } } } #ifdef VERBOSE @@ -375,10 +379,14 @@ int trim_with_level(int countlim, int im) { nextStrip(imod); ich=ichan+imod*nChans*nChips+ichip*nChans; if (*(inttrim+ich)==-1) { - *(inttrim+ich)=itrim-1; + *(inttrim+ich)=TRIM_DR; printf("could not trim channel %d chip %d module %d - set to %d\n", ichan, ichip, imod, *(inttrim+ich) ); retval=FAIL; } +#ifdef VERBOSE + else + printf("channel %d trimbit %d\n",ich,*(inttrim+ich) ); +#endif initChannel(inttrim[ich],0,0,1,0,0,imod); } nextChip(imod); @@ -435,7 +443,8 @@ int choose_vthresh() { int retval=OK; #ifdef MCB_FUNCS int imod, ichan; - int *scan, olddiff[nModX], direction[nModX]; + u_int32_t *scan; + int olddiff[nModX], direction[nModX]; int med[nModX], diff, media; int change_flag=1; int iteration=0; @@ -554,7 +563,8 @@ int trim_with_median(int stop, int im) { #ifdef MCB_FUNCS int ichan, imod, ichip, ich; - int *scan, *olddiff, *direction; + u_int32_t *scan; + int *olddiff, *direction; int med, diff; int change_flag=1; int iteration=0; @@ -576,7 +586,16 @@ int trim_with_median(int stop, int im) { olddiff=malloc(4*nModX*nChips*nChans); direction=malloc(4*nModX*nChips*nChans); - + for (imod=modmi; imod0) + if (diff>0) { direction[ichan]=1; - else + } else { direction[ichan]=-1; - } + } + } if ( direction[ichan]!=-3) { if (abs(diff)>abs(olddiff[ichan])) { - printf("%d old diff %d < new diff %d %d\n",ichan, olddiff[ichan], diff, direction[ichan]); trim=getTrimbit(imod,ichip,ich)+direction[ichan]; + printf("%d old diff %d < new diff %d %d - trimbit %d\n",ichan, olddiff[ichan], diff, direction[ichan], trim); direction[ichan]=-3; } else { trim=getTrimbit(imod,ichip,ich)-direction[ichan]; @@ -638,12 +668,12 @@ int trim_with_median(int stop, int im) { } if (trim>TRIM_DR) { trim=63; - printf("can't trim channel %d chip %d module %d\n",ich, ichip, imod); + printf("can't trim channel %d chip %d module %d to trim %d\n",ich, ichip, imod, trim); retval=FAIL; } if (trim<0) { + printf("can't trim channel %d chip %d module %d to trim %d\n",ich, ichip, imod, trim); trim=0; - printf("can't trim channel %d chip %d module %d\n",ich, ichip, imod); retval=FAIL; } initChannel(trim,0,0,1,0,0,imod); diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 9972f76e4..0c993dcd7 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -156,7 +156,10 @@ int slsDetector::initializeDetectorSize(detectorType type) { thisDetector->nMod[Y]=thisDetector->nModMax[Y]; thisDetector->nMods=thisDetector->nModsMax; /** calculates the expected data size */ - thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*thisDetector->dynamicRange/8; + if (thisDetector->dynamicRange==24) + thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*4; + else + thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*thisDetector->dynamicRange/8; /** set trimDsdir, calDir and filePath to default to home directory*/ strcpy(thisDetector->trimDir,getenv("HOME")); strcpy(thisDetector->calDir,getenv("HOME")); @@ -172,6 +175,8 @@ int slsDetector::initializeDetectorSize(detectorType type) { thisDetector->correctionMask=0; /** set deat time*/ thisDetector->tDead=0; + /** sets bad channel list file to none */ + strcpy(thisDetector->badChanFile,"none"); /** set number of bad chans to 0*/ thisDetector->nBadChans=0; /** set number of bad flat field chans to 0*/ @@ -194,6 +199,8 @@ int slsDetector::initializeDetectorSize(detectorType type) { thisDetector->clkDiv=1; /** set number of positions to 0*/ thisDetector->numberOfPositions=0; + /** sets angular conversion file to none */ + strcpy(thisDetector->angConvFile,"none"); /** set binsize*/ thisDetector->binSize=0; @@ -284,7 +291,7 @@ int slsDetector::initializeDetectorStructure() { } } -slsDetector::sls_detector_module* slsDetector::createModule() { +sls_detector_module* slsDetector::createModule() { sls_detector_module *myMod=(sls_detector_module*)malloc(sizeof(sls_detector_module)); float *dacs=new float[thisDetector->nDacs]; @@ -399,245 +406,6 @@ int slsDetector::setOnline(int off) { - - - - - - - - - /* detector configuration (no communication to server) */ - - /* - Every detector should have a basic configuration file containing: - type (mythen, pilatus etc.) - hostname - portnumber - communication type (default TCP/IP) - eventually secondary portnumber (e.g. mythen stop function) - number of modules installed if different from the detector size (x,y) - */ - -int slsDetector::readConfigurationFile(string const fname){ - - char hostname[1000]=DEFAULT_HOSTNAME; - int cport=DEFAULT_PORTNO, sport=DEFAULT_PORTNO+1,dport=-1; - int nmx=-1, nmy=-1; - float angoff=0.; - - - int nnames=14; - string names[]={"Hostname", "NmodX", "NmodY", "Detector", "ControlPort", "StopPort", "DataPort", "TrimBitDir","TrimBitEnergies", "CalDir", "BadChanList", "AngCal", "AngDirection", "FineOffset","GlobalOffset", "ClkDiv"}; - char line[500]; - string str; - ifstream infile; - string::size_type pos; - int iargval; - int interrupt=0; - - string sargname, sargval, dtype; - int iarg; - float farg; - int iline=0; - cout << "config file name "<< fname << endl; - infile.open(fname.c_str(), ios_base::in); - if (infile.is_open()) { - while (infile.good() and interrupt==0) { - sargname="none"; - sargval="0"; - getline(infile,str); - iline++; -#ifdef VERBOSE - // cout << str << endl; -#endif - if (str.find('#')!=string::npos) { - cout << "Line is a comment " << endl; - cout << str << endl; - continue; - } else { - istringstream ssstr(str); - ssstr >> sargname; - if (!ssstr.good()) { -#ifdef VERBOSE - // cout << "bad stream out" << endl; -#endif - interrupt=1; - break; - } else { - for (int iname=0; iname> sargval; - strcpy(hostname,sargval.c_str()); - break; - case 1: - ssstr>> nmx; - break; - case 2: - ssstr >> nmy; - break; - case 3: - ssstr >> dtype; - break; - case 4: - ssstr >> iargval; - cport=iargval; - break; - case 5: - ssstr >> iargval; - sport=iargval; - break; - case 6: - ssstr >> iargval; - dport=iargval; - break; - case 7: - ssstr>> sargval; - strcpy(thisDetector->trimDir,sargval.c_str()); - break; - case 8: - thisDetector->nTrimEn=0; - while (ssstr.good()) { - ssstr >> farg; - thisDetector->trimEnergies[thisDetector->nTrimEn]=farg; -#ifdef VERBOSE - cout << "trimbits acquired at energy " << farg << endl; -#endif - thisDetector->nTrimEn++; - } -#ifdef VERBOSE - cout << "total " << thisDetector->nTrimEn << " trimbitfiles" << endl; -#endif - case 9: - ssstr>> sargval; - strcpy(thisDetector->calDir,sargval.c_str()); - break; - case 10: - ssstr>> sargval; - // strcpy(thisDetector->badChanFile,sargval.c_str()); - break; - case 11: - ssstr>> sargval; - //strcpy(thisDetector->angConvFile,sargval.c_str()); - break; - case 12: - ssstr>> iargval; - thisDetector->angDirection=iargval; - break; - case 13: - ssstr>> farg; - thisDetector->fineOffset=farg; - break; - case 14: - ssstr>> farg; - thisDetector->globalOffset=farg; - break; - case 15: - ssstr>> iargval; - thisDetector->clkDiv=iargval; - break; - default: - cout << "unknown!" << endl; - } - break; - } - } - } - } - } - infile.close(); - } - else - { - cout << "Error opening configuration file " << fname << " for reading" << endl; - return FAIL; - } - - setTCPSocket(hostname,cport,sport,dport); - setDetectorType(dtype); - setNumberOfModules(nmx,X); - setNumberOfModules(nmy,Y); - - return OK; -}; - - -int slsDetector::writeConfigurationFile(string const fname){ - - - string names[]={"Hostname", "NmodX", "NmodY", "Detector", "ControlPort", "StopPort", "DataPort", "TrimBitDir", "TrimBitEnergies","CalDir", "BadChanList", "AngCal", "AngDirection", "AngOffset", "ClkDiv"}; - ofstream outfile; - char hostname[1000]=""; - - - outfile.open (fname.c_str(),ios_base::out); - if (outfile.is_open()) - { - while (outfile.good()) { - if (controlSocket) { - controlSocket->getHostname(hostname); - } - outfile << "Hostname " << hostname << endl; - outfile << "NModX " << setNumberOfModules(GET_FLAG, X) << endl; - outfile << "NModY " << setNumberOfModules(GET_FLAG, Y) << endl; - switch (thisDetector->myDetectorType) { - case MYTHEN: - outfile << "Detector Mythen" << endl; - break; - case PILATUS: - outfile << "Detector Pilatus" << endl; - break; - case EIGER: - outfile << "Detector EIGER" << endl; - break; - case GOTTHARD: - outfile << "Detector Gotthard" << endl; - break; - case AGIPD: - outfile << "Detector Agipd" << endl; - break; - default: - outfile << "Detector Generic" << endl; - break; - - } - if (controlSocket) - outfile << "ControlPort " << controlSocket->getPortNumber() << endl; - if (stopSocket) - outfile << "StopPort " << stopSocket->getPortNumber() << endl; - if (dataSocket) - outfile << "DataPort" << dataSocket->getPortNumber() << endl; - outfile << "TrimBitDir " << thisDetector->trimDir << endl; - outfile << "TrimBitEnergies" ; - for (int ien=0; ien< thisDetector->nTrimEn; ien++) - outfile << " " << thisDetector->trimEnergies[ien]<< endl; - outfile << endl; - outfile << "CalDir " << thisDetector->calDir << endl; - // outfile << "BadChanList " << thisDetector->badChanFile << endl; - //outfile << "AngCal " << thisDetector->angConvFile << endl; - outfile << "AngDirection " << thisDetector->angDirection << endl; - outfile << "FineOffset " << thisDetector->fineOffset<< endl; - outfile << "GlobalOffset " << thisDetector->globalOffset<< endl; - outfile << "ClkDiv " << thisDetector->clkDiv << endl; - } - outfile.close(); - } - else - { - cout << "Error opening configuration file " << fname << " for writing" << endl; - return FAIL; - } - return OK; -}; - /* - It should be possible to dump all the settings of the detector (including trimbits, threshold energy, gating/triggering, acquisition time etc. - in a file and retrieve it for repeating the measurement with identicals ettings, if necessary - */ -/* int slsDetector::dumpDetectorSetup(string fname){}; - int slsDetector::retrieveDetectorSetup(string fname){}; -*/ /* configure the socket communication and check that the server exists enum communicationProtocol{ @@ -801,207 +569,6 @@ int slsDetector::setTCPSocket(string const name, int const control_port, int con /* I/O */ - - slsDetector::sls_detector_module* slsDetector::readTrimFile(string fname, slsDetector::sls_detector_module *myMod){ - - int nflag=0; - - if (myMod==NULL) { - myMod=createModule(); - nflag=1; - } - string myfname; - string str; - ifstream infile; - ostringstream oss; - int isgood=1; - int iline=0; - string names[]={"Vtrim", "Vthresh", "Rgsh1", "Rgsh2", "Rgpr", "Vcal", "outBuffEnable"}; - string sargname; - int ival; - int ichan=0, ichip=0, idac=0; - - - -#ifdef VERBOSE - cout << "reading trimfile for module number "<< myMod->module << endl; -#endif - //im=myMod->module; - //myMod->module=im; - // myMod->serialnumber=getId(MODULE_SERIAL_NUMBER, im); - // if (im<0) - myfname=fname; - /* else { - // oss << fname << ".sn" << setfill('0') <serialnumber - oss << fname << ".sn" << setfill('0') <module; - myfname=oss.str(); - - }*/ -#ifdef VERBOSE - cout << "trim file name is "<< myfname << endl; -#endif - infile.open(myfname.c_str(), ios_base::in); - if (infile.is_open()) { - // while (infile.good() && isgood==1) { - for (int iarg=0; iargnDacs; iarg++) { - getline(infile,str); - iline++; -#ifdef VERBOSE - // cout << str << endl; -#endif - istringstream ssstr(str); - ssstr >> sargname >> ival; -#ifdef VERBOSE - cout << sargname << " dac nr. " << idac << " is " << ival << endl; -#endif - myMod->dacs[idac]=ival; - idac++; - } - for (ichip=0; ichipnChips; ichip++) { - getline(infile,str); - iline++; -#ifdef VERBOSE - // cout << str << endl; -#endif - istringstream ssstr(str); - ssstr >> sargname >> ival; -#ifdef VERBOSE - // cout << "chip " << ichip << " " << sargname << " is " << ival << endl; -#endif - - myMod->chipregs[ichip]=ival; - for (ichan=0; ichannChans; ichan++) { - getline(infile,str); -#ifdef VERBOSE - // cout << str << endl; -#endif - istringstream ssstr(str); - -#ifdef VERBOSE - // cout << "channel " << ichan+ichip*thisDetector->nChans <<" iline " << iline<< endl; -#endif - iline++; - myMod->chanregs[ichip*thisDetector->nChans+ichan]=0; - for (int iarg=0; iarg<6 ; iarg++) { - ssstr >> ival; - //if (ssstr.good()) { - switch (iarg) { - case 0: -#ifdef VERBOSE - // cout << "trimbits " << ival ; -#endif - myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival&0x3f; - break; - case 1: -#ifdef VERBOSE - //cout << " compen " << ival ; -#endif - myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival<<9; - break; - case 2: -#ifdef VERBOSE - //cout << " anen " << ival ; -#endif - myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival<<8; - break; - case 3: -#ifdef VERBOSE - //cout << " calen " << ival ; -#endif - myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival<<7; - break; - case 4: -#ifdef VERBOSE - //cout << " outcomp " << ival ; -#endif - myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival<<10; - break; - case 5: -#ifdef VERBOSE - //cout << " counts " << ival << endl; -#endif - myMod->chanregs[ichip*thisDetector->nChans+ichan]|=ival<<11; - break; - default: - cout << " too many columns" << endl; - break; - } - } - } - // } - } -#ifdef VERBOSE - cout << "read " << ichan*ichip << " channels" <nChans; ichan++) { - iv=mod.chanregs[ichip*thisDetector->nChans+ichan]; - iv1= (iv&0x3f); - outfile <>nb); - outfile << iv1 << " "; - nb=8; - iv1=((iv&(1<>nb); - outfile << iv1 << " "; - nb=7; - iv1=((iv&(1<>nb); - outfile <>nb); - outfile << iv1 << " "; - nb=11; - iv1= ((iv&0xfffff800)>>nb); - outfile << iv1 << endl; - } - } - outfile.close(); - return OK; - } else { - cout << "could not open file " << fname << endl; - return FAIL; - } - -}; - - - - -int slsDetector::writeTrimFile(string fname, int imod){ - - return writeTrimFile(fname,detectorModules[imod]); - -}; - /* generates file name without extension*/ string slsDetector::createFileName() { @@ -1020,238 +587,7 @@ string slsDetector::createFileName() { } -int slsDetector::writeDataFile(string fname, float *data, float *err, float *ang, char dataformat, int nch){ - if (nch==-1) - nch=thisDetector->nChans*thisDetector->nChips*thisDetector->nMods; - - ofstream outfile; - int idata; - if (data==NULL) - return FAIL; -#ifdef VERBOSE - cout << "writing data to file " << fname << endl; -#endif - // args|=0x10; // one line per channel! - - outfile.open (fname.c_str(),ios_base::out); - if (outfile.is_open()) - { -#ifdef VERBOSE - cout << "Writing to file " << fname << endl; -#endif - for (int ichan=0; ichannChans*thisDetector->nChips*thisDetector->nMods; ichan++) - outfile << ichan << " " << *(data+ichan) << endl; - outfile.close(); - return OK; - } else { - cout << "Could not open file " << fname << "for writing"<< endl; - return FAIL; - } -}; - - - - - -int slsDetector::readDataFile(string fname, float *data, float *err, float *ang, char dataformat, int nch){ - - - ifstream infile; - int ichan, iline=0; - int interrupt=0; - float fdata, ferr, fang; - int maxchans; - int ich; - string str; - - if (nch==0) - maxchans=thisDetector->nChans*thisDetector->nChips*thisDetector->nMods; - else if (nch<0) - maxchans=0xfffffff; - else - maxchans=nch; - -#ifdef VERBOSE - cout << "Opening file "<< fname << endl; -#endif - infile.open(fname.c_str(), ios_base::in); - if (infile.is_open()) { - while (infile.good() and interrupt==0) { - getline(infile,str); -#ifdef VERBOSE - cout << str << endl; -#endif - istringstream ssstr(str); - if (ang==NULL) { - ssstr >> ichan >> fdata; - ich=ichan; - if (ich!=iline) - cout << "Channel number " << ichan << " does not match with line number " << iline << endl; - } else { - ssstr >> fang >> fdata; - ich=iline; - } - if (!ssstr.good()) { - interrupt=1; - break; - } - if (err) - ssstr >> ferr; - if (!ssstr.good()) { - interrupt=1; - break; - } - if (ich> ichan >> idata; - if (!ssstr.good()) { - interrupt=1; - break; - } - if (ichan!=iline) { - cout << " Expected channel "<< iline <<" but read channel "<< ichan << endl; - interrupt=1; - break; - } else { - if (ilinenChans*thisDetector->nChips*thisDetector->nMods) { - data[iline]=idata; - iline++; - } else { - interrupt=1; - break; - } - } - } - } else { - cout << "Could not read file " << fname << endl; - return -1; - } - return iline; -}; - - - - -int slsDetector::readCalibrationFile(string fname, float &gain, float &offset){ - - char line[500]; - string str; - ifstream infile; -#ifdef VERBOSE - cout << "Opening file "<< fname << endl; -#endif - infile.open(fname.c_str(), ios_base::in); - if (infile.is_open()) { - getline(infile,str); -#ifdef VERBOSE - cout << str << endl; -#endif - istringstream ssstr(str); - ssstr >> offset >> gain; - } else { - cout << "Could not open calibration file "<< fname << endl; - gain=0.; - offset=0.; - return -1; - } - return 0; -}; -/* -int slsDetector::writeCalibrationFile(string fname, float gain, float offset){}; -*/ /* Communication to server */ // General purpose functions @@ -1463,7 +799,15 @@ int slsDetector::setNumberOfModules(int n, dimension d){ } else { thisDetector->nMod[d]=retval; thisDetector->nMods=thisDetector->nMod[X]*thisDetector->nMod[Y]; - thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*thisDetector->dynamicRange/8; + int dr=thisDetector->dynamicRange; + if (dr==24) + dr=32; + + thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*dr/8; +#ifdef VERBOSE + cout << "Data size is " << thisDetector->dataBytes << endl; + cout << "nModX " << thisDetector->nMod[X] << " nModY " << thisDetector->nMod[Y] << " nChips " << thisDetector->nChips << " nChans " << thisDetector->nChans<< " dr " << dr << endl; +#endif } return thisDetector->nMod[d]; }; @@ -1533,7 +877,7 @@ enum externalSignalFlag { }{}; */ - slsDetector::externalSignalFlag slsDetector::setExternalSignalFlags( slsDetector::externalSignalFlag pol, int signalindex){ + externalSignalFlag slsDetector::setExternalSignalFlags(externalSignalFlag pol, int signalindex){ @@ -1597,7 +941,7 @@ enum externalSignalFlag { */ - slsDetector::externalCommunicationMode slsDetector::setExternalCommunicationMode( slsDetector::externalCommunicationMode pol){ + externalCommunicationMode slsDetector::setExternalCommunicationMode( externalCommunicationMode pol){ @@ -1616,7 +960,8 @@ enum externalSignalFlag { cout << endl; cout << "Setting communication to mode " << pol << endl; #endif - if (onlineFlag==ONLINE_FLAG) { if (controlSocket) { + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->SendDataOnly(&arg,sizeof(arg)); @@ -1663,7 +1008,7 @@ enum externalSignalFlag { -int64_t slsDetector::getId( slsDetector::idMode mode, int imod){ +int64_t slsDetector::getId( idMode mode, int imod){ int64_t retval; @@ -1723,7 +1068,7 @@ int64_t slsDetector::getId( slsDetector::idMode mode, int imod){ returns ok or error mask */ -int slsDetector::digitalTest( slsDetector::digitalTestMode mode, int imod){ +int slsDetector::digitalTest( digitalTestMode mode, int imod){ int retval; @@ -2086,6 +1431,7 @@ int slsDetector::setChannel(sls_detector_channel chan){ int im=chan.module; if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); sendChannel(&chan); @@ -2099,6 +1445,7 @@ int slsDetector::setChannel(sls_detector_channel chan){ } controlSocket->Disconnect(); } + } } @@ -2114,7 +1461,7 @@ int slsDetector::setChannel(sls_detector_channel chan){ } - slsDetector::sls_detector_channel slsDetector::getChannel(int ichan, int ichip, int imod){ + sls_detector_channel slsDetector::getChannel(int ichan, int ichip, int imod){ int fnum=F_GET_CHANNEL; @@ -2126,6 +1473,7 @@ int slsDetector::setChannel(sls_detector_channel chan){ arg[1]=ichip; arg[2]=imod; if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->SendDataOnly(arg,sizeof(arg)); @@ -2139,6 +1487,7 @@ int slsDetector::setChannel(sls_detector_channel chan){ } controlSocket->Disconnect(); } + } } @@ -2162,7 +1511,7 @@ int slsDetector::setChannel(sls_detector_channel chan){ }{}; */ int slsDetector::setChip(int reg, int ichip, int imod){ - slsDetector::sls_detector_chip myChip; + sls_detector_chip myChip; #ifdef VERBOSE cout << "Setting chip "<< ichip << " " << imod << " to " << reg << endl; @@ -2201,7 +1550,7 @@ int slsDetector::setChip(int reg, int ichip, int imod){ return ret; } -int slsDetector::setChip( slsDetector::sls_detector_chip chip){ +int slsDetector::setChip(sls_detector_chip chip){ int fnum=F_SET_CHIP; int retval; @@ -2216,6 +1565,7 @@ int slsDetector::setChip( slsDetector::sls_detector_chip chip){ if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); sendChip(&chip); @@ -2228,6 +1578,7 @@ int slsDetector::setChip( slsDetector::sls_detector_chip chip){ } controlSocket->Disconnect(); } + } } @@ -2243,7 +1594,7 @@ int slsDetector::setChip( slsDetector::sls_detector_chip chip){ }; - slsDetector::sls_detector_chip slsDetector::getChip(int ichip, int imod){ + sls_detector_chip slsDetector::getChip(int ichip, int imod){ int fnum=F_GET_CHIP; sls_detector_chip myChip; @@ -2266,6 +1617,7 @@ int slsDetector::setChip( slsDetector::sls_detector_chip chip){ if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->SendDataOnly(arg,sizeof(arg)); @@ -2279,6 +1631,7 @@ int slsDetector::setChip( slsDetector::sls_detector_chip chip){ } controlSocket->Disconnect(); } + } } @@ -2396,6 +1749,7 @@ int slsDetector::setModule(sls_detector_module module){ if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); sendModule(&module); @@ -2408,6 +1762,7 @@ int slsDetector::setModule(sls_detector_module module){ } controlSocket->Disconnect(); } + } } @@ -2426,7 +1781,7 @@ int slsDetector::setModule(sls_detector_module module){ }; -slsDetector::sls_detector_module *slsDetector::getModule(int imod){ +sls_detector_module *slsDetector::getModule(int imod){ int fnum=F_GET_MODULE; @@ -2463,6 +1818,7 @@ slsDetector::sls_detector_module *slsDetector::getModule(int imod){ if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->SendDataOnly(&imod,sizeof(imod)); @@ -2476,6 +1832,7 @@ slsDetector::sls_detector_module *slsDetector::getModule(int imod){ } controlSocket->Disconnect(); } + } } @@ -2562,18 +1919,23 @@ int slsDetector::getThresholdEnergy(int imod){ #ifdef VERBOSE cout << "Getting threshold energy "<< endl; #endif - if (controlSocket->Connect()>=0) { - controlSocket->SendDataOnly(&fnum,sizeof(fnum)); - controlSocket->SendDataOnly(&imod,sizeof(imod)); - controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); - if (ret!=OK) { - cout << "Detector returned error: "<< endl; - controlSocket->ReceiveDataOnly(mess,sizeof(mess)); - cout << mess << endl; - } else { - controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); + + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { + if (controlSocket->Connect()>=0) { + controlSocket->SendDataOnly(&fnum,sizeof(fnum)); + controlSocket->SendDataOnly(&imod,sizeof(imod)); + controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); + if (ret!=OK) { + cout << "Detector returned error: "<< endl; + controlSocket->ReceiveDataOnly(mess,sizeof(mess)); + cout << mess << endl; + } else { + controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); + } + controlSocket->Disconnect(); + } } - controlSocket->Disconnect(); } return retval; }; @@ -2587,23 +1949,27 @@ int slsDetector::setThresholdEnergy(int e_eV, int imod, detectorSettings isetti #ifdef VERBOSE cout << "Getting threshold energy "<< endl; #endif - if (controlSocket->Connect()>=0) { - controlSocket->SendDataOnly(&fnum,sizeof(fnum)); - controlSocket->SendDataOnly(&e_eV,sizeof(e_eV)); - controlSocket->SendDataOnly(&imod,sizeof(imod)); - controlSocket->SendDataOnly(&isettings,sizeof(isettings)); - controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); - if (ret!=OK) { - cout << "Detector returned error: "<< endl; - controlSocket->ReceiveDataOnly(mess,sizeof(mess)); - cout << mess << endl; - } else { + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { + if (controlSocket->Connect()>=0) { + controlSocket->SendDataOnly(&fnum,sizeof(fnum)); + controlSocket->SendDataOnly(&e_eV,sizeof(e_eV)); + controlSocket->SendDataOnly(&imod,sizeof(imod)); + controlSocket->SendDataOnly(&isettings,sizeof(isettings)); + controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); + if (ret!=OK) { + cout << "Detector returned error: "<< endl; + controlSocket->ReceiveDataOnly(mess,sizeof(mess)); + cout << mess << endl; + } else { #ifdef VERBOSE - cout << "Detector returned OK "<< endl; + cout << "Detector returned OK "<< endl; #endif - controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); + controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); + } + controlSocket->Disconnect(); + } } - controlSocket->Disconnect(); } return retval; }; @@ -2611,7 +1977,7 @@ int slsDetector::setThresholdEnergy(int e_eV, int imod, detectorSettings isetti /* select detector settings */ - slsDetector::detectorSettings slsDetector::getSettings(int imod){ + detectorSettings slsDetector::getSettings(int imod){ int fnum=F_SET_SETTINGS; @@ -2624,28 +1990,31 @@ int slsDetector::setThresholdEnergy(int e_eV, int imod, detectorSettings isetti #ifdef VERBOSE cout << "Getting settings "<< endl; #endif - if (controlSocket->Connect()>=0) { - controlSocket->SendDataOnly(&fnum,sizeof(fnum)); - controlSocket->SendDataOnly(arg,sizeof(arg)); - controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); - if (ret!=OK) { - controlSocket->ReceiveDataOnly(mess,sizeof(mess)); - cout << "Detector returned error: " << mess << endl; - } else{ - controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); - + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { + if (controlSocket->Connect()>=0) { + controlSocket->SendDataOnly(&fnum,sizeof(fnum)); + controlSocket->SendDataOnly(arg,sizeof(arg)); + controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); + if (ret!=OK) { + controlSocket->ReceiveDataOnly(mess,sizeof(mess)); + cout << "Detector returned error: " << mess << endl; + } else{ + controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); + thisDetector->currentSettings=(detectorSettings)retval; #ifdef VERBOSE - cout << "Settings are "<< retval << endl; + cout << "Settings are "<< retval << endl; #endif } - controlSocket->Disconnect(); + controlSocket->Disconnect(); + } + } } - thisDetector->currentSettings=(detectorSettings)retval; return thisDetector->currentSettings; }; - slsDetector::detectorSettings slsDetector::setSettings( slsDetector::detectorSettings isettings, int imod){ + detectorSettings slsDetector::setSettings( detectorSettings isettings, int imod){ sls_detector_module *myMod=createModule(); int modmi=imod, modma=imod+1, im=imod; string trimfname, calfname; @@ -2723,6 +2092,8 @@ int slsDetector::startAcquisition(){ #ifdef VERBOSE cout << "Starting acquisition "<< endl; #endif + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); @@ -2731,6 +2102,8 @@ int slsDetector::startAcquisition(){ cout << "Detector returned error: " << mess << endl; } controlSocket->Disconnect(); + } + } } return ret; @@ -2747,6 +2120,8 @@ int slsDetector::stopAcquisition(){ #ifdef VERBOSE cout << "Stopping acquisition "<< endl; #endif + if (onlineFlag==ONLINE_FLAG) { + if (stopSocket) { if (stopSocket->Connect()>=0) { stopSocket->SendDataOnly(&fnum,sizeof(fnum)); stopSocket->ReceiveDataOnly(&ret,sizeof(ret)); @@ -2755,6 +2130,8 @@ int slsDetector::stopAcquisition(){ cout << "Detector returned error: " << mess << endl; } stopSocket->Disconnect(); + } + } } return ret; @@ -2770,6 +2147,8 @@ int slsDetector::startReadOut(){ #ifdef VERBOSE cout << "Starting readout "<< endl; #endif + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); @@ -2778,6 +2157,8 @@ int slsDetector::startReadOut(){ cout << "Detector returned error: " << mess << endl; } controlSocket->Disconnect(); + } + } } return ret; }; @@ -2792,6 +2173,8 @@ int slsDetector::getRunStatus(){ #ifdef VERBOSE cout << "Getting status "<< endl; #endif + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); @@ -2801,6 +2184,8 @@ int slsDetector::getRunStatus(){ } else controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); controlSocket->Disconnect(); + } + } } return retval; @@ -2810,19 +2195,19 @@ int slsDetector::getRunStatus(){ int* slsDetector::readFrame(){ int fnum=F_READ_FRAME, n; - int nel=thisDetector->dataBytes/sizeof(int); - int* retval=new int[nel]; - int ret=FAIL; - char mess[100]; - int i; + int* retval; #ifdef VERBOSE cout << "slsDetector: Reading frame "<< endl; #endif + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); retval=getDataFromDetector(); controlSocket->Disconnect(); + } + } } return retval; }; @@ -2839,21 +2224,24 @@ int* slsDetector::getDataFromDetector(){ #endif #ifdef VERBOSE - // cout << "getting data "<< endl; + // cout << "getting data "<< endl; #endif controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); if (ret!=OK) { - controlSocket->ReceiveDataOnly(mess,sizeof(mess)); - cout << "Detector returned: " << mess << endl; + n= controlSocket->ReceiveDataOnly(mess,sizeof(mess)); +#ifndef VERBOSE + if (ret==FAIL) +#endif + cout << "Detector returned: " << mess << " " << n << endl; delete [] retval; retval=NULL; } else { n=controlSocket->ReceiveDataOnly(retval,thisDetector->dataBytes); #ifdef VERBOSE - // cout << "Received "<< n << " data bytes" << endl; + cout << "Received "<< n << " data bytes" << endl; #endif - if (ndataBytes) { + if (n!=thisDetector->dataBytes) { cout << "wrong data size received: received " << n << " but expected " << thisDetector->dataBytes << endl; ret=FAIL; delete [] retval; @@ -2877,6 +2265,8 @@ int* slsDetector::readAll(){ #ifdef VERBOSE cout << "Reading all frames "<< endl; #endif + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); while (retval=getDataFromDetector()){ @@ -2888,9 +2278,11 @@ int* slsDetector::readAll(){ } controlSocket->Disconnect(); } - //#ifdef VERBOSE - cout << "recieved "<< i<< " frames" << endl; - //#endif + } + } +#ifdef VERBOSE + cout << "received "<< i<< " frames" << endl; +#endif return dataQueue.front(); // check what we return! }; @@ -2937,17 +2329,24 @@ int slsDetector::startAndReadAllNoWait(){ #ifdef VERBOSE cout << "Starting and reading all frames "<< endl; #endif + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); return OK; + } + } } return FAIL; }; int* slsDetector::getDataFromDetectorNoWait() { int *retval=getDataFromDetector(); - if (retval==NULL){ - controlSocket->Disconnect(); + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { + if (retval==NULL){ + controlSocket->Disconnect(); + #ifdef VERBOSE cout << "Run finished "<< endl; #endif @@ -2955,6 +2354,8 @@ int* slsDetector::getDataFromDetectorNoWait() { #ifdef VERBOSE cout << "Frame received "<< endl; #endif + } + } } return retval; // check what we return! }; @@ -2989,7 +2390,7 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){ int fnum=F_SET_TIMER; int64_t retval; - uint64_t ut, uretval; + uint64_t ut; char mess[100]; int ret=OK; int n=0; @@ -2997,6 +2398,8 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){ cout << "Setting timer "<< index << " to " << t << "ns" << endl; #endif ut=t; + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->SendDataOnly(&index,sizeof(index)); @@ -3013,6 +2416,8 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){ } controlSocket->Disconnect(); } + } + } #ifdef VERBOSE cout << "Timer set to "<< retval << "ns" << endl; #endif @@ -3022,6 +2427,69 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){ }; +/* + important speed parameters + +enum speedVariable { + CLOCK_DIVIDER, + WAIT_STATES, + SET_SIGNAL_LENGTH +}; +*/ + +int slsDetector::setSpeed(speedVariable sp, int value) { + + + int fnum=F_SET_SPEED; + int retval; + char mess[100]; + int ret=OK; + int n=0; +#ifdef VERBOSE + cout << "Setting speed variable"<< sp << " to " << value << endl; +#endif + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { + if (controlSocket->Connect()>=0) { + controlSocket->SendDataOnly(&fnum,sizeof(fnum)); + controlSocket->SendDataOnly(&sp,sizeof(sp)); + n=controlSocket->SendDataOnly(&value,sizeof(value)); +#ifdef VERBOSE + cout << "Sent "<< n << " bytes " << endl; +#endif + controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); + if (ret!=OK) { + controlSocket->ReceiveDataOnly(mess,sizeof(mess)); + cout << "Detector returned error: " << mess << endl; + } else { + controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); + } + controlSocket->Disconnect(); + } + } + } +#ifdef VERBOSE + cout << "Speed set to "<< retval << endl; +#endif + return retval; + +} + + + + + + + + + + + + + + + + int64_t slsDetector::getTimeLeft(timerIndex index){ @@ -3033,6 +2501,8 @@ int64_t slsDetector::getTimeLeft(timerIndex index){ #ifdef VERBOSE cout << "Getting timer "<< index << endl; #endif + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->SendDataOnly(&index,sizeof(index)); @@ -3046,7 +2516,8 @@ int64_t slsDetector::getTimeLeft(timerIndex index){ } controlSocket->Disconnect(); } - + } + } #ifdef VERBOSE cout << "Time left is "<< retval << endl; #endif @@ -3068,6 +2539,8 @@ int slsDetector::setDynamicRange(int n){ #endif if (n==24) n=32; + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->SendDataOnly(&n,sizeof(n)); @@ -3079,6 +2552,8 @@ int slsDetector::setDynamicRange(int n){ controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); } controlSocket->Disconnect(); + } + } } if (ret==OK) { thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*retval/8; @@ -3129,6 +2604,8 @@ int slsDetector::setReadOutFlags(readOutFlags flag){ cout << "Setting readout flags to "<< flag << endl; #endif + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->SendDataOnly(&flag,sizeof(flag)); @@ -3142,6 +2619,8 @@ int slsDetector::setReadOutFlags(readOutFlags flag){ } controlSocket->Disconnect(); } + } + } #ifdef VERBOSE cout << "Readout flag set to "<< retval << endl; #endif @@ -3174,6 +2653,8 @@ int slsDetector::executeTrimming(trimMode mode, int par1, int par2, int imod){ cout << "Trimming module " << imod << " with mode "<< mode << " parameters " << par1 << " " << par2 << endl; #endif + if (onlineFlag==ONLINE_FLAG) { + if (controlSocket) { if (controlSocket->Connect()>=0) { controlSocket->SendDataOnly(&fnum,sizeof(fnum)); cout << "sending mode bytes= "<< controlSocket->SendDataOnly(&mode,sizeof(mode)) << endl; @@ -3193,6 +2674,8 @@ int slsDetector::executeTrimming(trimMode mode, int par1, int par2, int imod){ retval=ret; } controlSocket->Disconnect(); + } + } } return retval; @@ -3212,6 +2695,17 @@ float* slsDetector::decodeData(int *datain) { int nch, boff=0; switch (nbits) { + case 1: + for (ibyte=0; ibytedataBytes; ibyte++) { + iptr=ptr[ibyte]&0x1; + for (ipos=0; ipos<8; ipos++) { + // dataout[ibyte*2+ichan]=((iptr&((0xf)<>ichan)&0xf; + ival=(iptr>>(ipos))&0x1; + dataout[ichan]=ival; + ichan++; + } + } + break; case 4: for (ibyte=0; ibytedataBytes; ibyte++) { iptr=ptr[ibyte]&0xff; @@ -3301,8 +2795,14 @@ int slsDetector::setFlatFieldCorrection(string fname){ thisDetector->nBadFF=0; if (fname=="") { +#ifdef VERBOSE + cout << "disabling flat field corrections" << endl; +#endif thisDetector->correctionMask&=~(1<0) { for (int ichan=0; ichancorrectionMask&(1<nMod[X]*thisDetector->nMod[Y]*thisDetector->nChans*thisDetector->nChips; ichan++) { corr[ichan]=ffcoefficients[ichan]; @@ -3371,6 +2874,9 @@ int slsDetector::getFlatFieldCorrections(float *corr, float *ecorr) { } return 1; } else { +#ifdef VERBOSE + cout << "Flat field correction is disabled" << endl; +#endif if (corr) for (int ichan=0; ichannMod[X]*thisDetector->nMod[Y]*thisDetector->nChans*thisDetector->nChips; ichan++) { corr[ichan]=1; @@ -3381,6 +2887,8 @@ int slsDetector::getFlatFieldCorrections(float *corr, float *ecorr) { } } + + int slsDetector::flatFieldCorrect(float datain, float errin, float &dataout, float &errout, float ffcoefficient, float fferr){ float e; @@ -3400,6 +2908,9 @@ int slsDetector::flatFieldCorrect(float datain, float errin, float &dataout, flo }; int slsDetector::flatFieldCorrect(float* datain, float *errin, float* dataout, float *errout){ +#ifdef VERBOSE + cout << "Flat field correcting data" << endl; +#endif float e, eo; if (thisDetector->correctionMask&(1<nMod[X]*thisDetector->nMod[Y]*thisDetector->nChans*thisDetector->nChips; ichan++) { @@ -3420,9 +2931,12 @@ int slsDetector::flatFieldCorrect(float* datain, float *errin, float* dataout, f int slsDetector::setRateCorrection(float t){ float tdead[]=defaultTDead; - if (t==0) + if (t==0) { +#ifdef VERBOSE + cout << "unsetting rate corrections" << endl; +#endif thisDetector->correctionMask&=~(1<correctionMask|=(1<0) thisDetector->tDead=t; @@ -3430,6 +2944,9 @@ int slsDetector::setRateCorrection(float t){ if (thisDetector->currentSettings<3 && thisDetector->currentSettings>-1) thisDetector->tDead=tdead[thisDetector->currentSettings]; } +#ifdef VERBOSE + cout << "Setting rate corrections with dead time "<< thisDetector->tDead << endl; +#endif } return thisDetector->correctionMask&(1<correctionMask&(1<tDead << endl; +#endif t=thisDetector->tDead; return 1; } else +#ifdef VERBOSE + cout << "Rate correction is disabled " << endl; +#endif return 0; }; @@ -3481,6 +3004,9 @@ int slsDetector::rateCorrect(float* datain, float *errin, float* dataout, float float data; float e; if (thisDetector->correctionMask&(1<nMod[X]*thisDetector->nMod[Y]*thisDetector->nChans*thisDetector->nChips; ichan++) { if (errin==NULL) { @@ -3587,121 +3113,20 @@ int slsDetector::fillBadChannelMask() { } - -int slsDetector::setAngularConversion(string fname) { - if (fname=="") { - thisDetector->correctionMask&=~(1<< ANGULAR_CONVERSION); - } else { - if (readAngularConversion(fname)>=0) - thisDetector->correctionMask|=(1<< ANGULAR_CONVERSION); - } - return thisDetector->correctionMask&(1<< ANGULAR_CONVERSION); -} - -int slsDetector::getAngularConversion(int &direction, angleConversionConstant *angconv) { - if (thisDetector->correctionMask&(1<< ANGULAR_CONVERSION)) { - direction=thisDetector->angDirection; - if (angconv) { - for (int imod=0; imodnMods; imod++) { - (angconv+imod)->center=thisDetector->angOff[imod].center; - (angconv+imod)->r_conversion=thisDetector->angOff[imod].r_conversion; - (angconv+imod)->offset=thisDetector->angOff[imod].offset; - (angconv+imod)->ecenter=thisDetector->angOff[imod].ecenter; - (angconv+imod)->er_conversion=thisDetector->angOff[imod].er_conversion; - (angconv+imod)->eoffset=thisDetector->angOff[imod].eoffset; - } - } - return 1; - } else - return 0; - - -} - - - -int slsDetector::readAngularConversion(string fname) { - char line[500]; - string str; - ifstream infile; - int mod; - float center, ecenter; - float r_conv, er_conv; - float off, eoff; - string ss; - int interrupt=0; - - //" module %i center %E +- %E conversion %E +- %E offset %f +- %f \n" -#ifdef VERBOSE - cout << "Opening file "<< fname << endl; -#endif - infile.open(fname.c_str(), ios_base::in); - if (infile.is_open()) { - while (infile.good() and interrupt==0) { - getline(infile,str); -#ifdef VERBOSE - cout << str << endl; -#endif - istringstream ssstr(str); - ssstr >> ss >> mod; - ssstr >> ss >> center; - ssstr >> ss >> ecenter; - ssstr >> ss >> r_conv; - ssstr >> ss >> er_conv; - ssstr >> ss >> off; - ssstr >> ss >> eoff; - if (modnModsMax && mod>=0) { - thisDetector->angOff[mod].center=center; - thisDetector->angOff[mod].r_conversion=r_conv; - thisDetector->angOff[mod].offset=off; - thisDetector->angOff[mod].ecenter=ecenter; - thisDetector->angOff[mod].er_conversion=er_conv; - thisDetector->angOff[mod].eoffset=eoff; - } - } - } else { - cout << "Could not open calibration file "<< fname << endl; - return -1; - } - return 0; -} - - -int slsDetector:: writeAngularConversion(string fname) { - ofstream outfile; - outfile.open (fname.c_str(),ios_base::out); - if (outfile.is_open()) - { - for (int imod=0; imodnMods; imod++) { - outfile << " module " << imod << " center "<< thisDetector->angOff[imod].center<<" +- "<< thisDetector->angOff[imod].ecenter<<" conversion "<< thisDetector->angOff[imod].r_conversion << " +- "<< thisDetector->angOff[imod].er_conversion << " offset "<< thisDetector->angOff[imod].offset << " +- "<< thisDetector->angOff[imod].eoffset << endl; - } - outfile.close(); - } else { - cout << "Could not open file " << fname << "for writing"<< endl; - return -1; - } - //" module %i center %E +- %E conversion %E +- %E offset %f +- %f \n" - return 0; -} - - - - - - - int slsDetector::exitServer(){ int retval; int fnum=F_EXIT_SERVER; + if (onlineFlag==ONLINE_FLAG) { if (controlSocket) { controlSocket->Connect(); controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); controlSocket->Disconnect(); } + } if (retval==OK) { cout << endl; cout << "Shutting down the server" << endl; @@ -3710,295 +3135,6 @@ int slsDetector::exitServer(){ return retval; }; -int slsDetector::resetMerging(float *mp, float *mv, float *me, int *mm) { - - float binsize; - if (thisDetector->binSize>0) - binsize=thisDetector->binSize; - else - return FAIL; - - for (int ibin=0; ibin<(360./binsize); ibin++) { - mp[ibin]=0; - mv[ibin]=0; - me[ibin]=0; - mm[ibin]=0; - } - return OK; -} - - -int slsDetector::finalizeMerging(float *mp, float *mv, float *me, int *mm) { - float binsize; - int np=0; - - if (thisDetector->binSize>0) - binsize=thisDetector->binSize; - else - return FAIL; - - for (int ibin=0; ibin<(360./binsize); ibin++) { - if (mm[ibin]>0) { - mp[np]=mp[ibin]/mm[ibin]; - mv[np]=mv[ibin]/mm[ibin]; - me[np]=me[ibin]/mm[ibin]; - me[np]=sqrt(me[ibin]); - mm[np]=mm[ibin]; - np++; - } - } - return OK; -} - -int slsDetector::addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv,float *me, int *mm) { - - float binsize; - float binmi=-180., binma; - int ibin=0; - int imod; - float ang; - - if (thisDetector->binSize>0) - binsize=thisDetector->binSize; - else - return FAIL; - binmi=-180.; - binma=binmi+binsize; - - - if (thisDetector->angDirection>0) { - for (int ip=0; ipnChans*thisDetector->nChips*thisDetector->nMods; ip++) { - if (thisDetector->correctionMask&DISCARD_BAD_CHANNELS) { - if (badChannelMask[ip]) - continue; - } - imod=ip/(thisDetector->nChans*thisDetector->nChips); - if (p1) - ang=p1[ip]; - else - ang=angle(ip,currentPosition,thisDetector->fineOffset+thisDetector->globalOffset,thisDetector->angOff[imod].r_conversion,thisDetector->angOff[imod].center, thisDetector->angOff[imod].offset,thisDetector->angOff[imod].tilt,thisDetector->angDirection); - - - - while (binmanChans*thisDetector->nChips*thisDetector->nMods-1; ip>=0; ip--) { - if (thisDetector->correctionMask&(1<< DISCARD_BAD_CHANNELS)) { - if (badChannelMask[ip]) - continue; - } - - while (binmanumberOfPositions>0) - np=thisDetector->numberOfPositions; - - currentPositionIndex=0; - - for (int ip=0; ipnumberOfPositions>0) { - go_to_position (thisDetector->detPositions[ip]); - currentPositionIndex=ip+1; - } - //write header before? - - - startAndReadAll(); - - if (thisDetector->correctionMask&(1<< I0_NORMALIZATION)) - currentI0=get_i0(); - - //write header after? - - - if (thisDetector->correctionMask&(1<< ANGULAR_CONVERSION)) - currentPosition=get_position(); - - processData(); - - - - } -} - - -void* slsDetector::processData() { - - - int *myData; - float *fdata; - // float *dataout=new float[thisDetector->nChans*thisDetector->nChips*thisDetector->nMods]; - float *rcdata=NULL, *rcerr=NULL; - float *ffcdata=NULL, *ffcerr=NULL; - float *ang=NULL; - float bs=0.004; - int i=0; - int imod; - int nb; - while(1) { - - - if( !dataQueue.empty() ) { - - /** Pop data queue */ - myData=dataQueue.front(); // get the data from the queue - dataQueue.pop(); //remove the data from the queue - if (myData) { - //process data - - /** decode data */ - fdata=decodeData(myData); - - delete [] myData; - myData=NULL; - /** write raw data file */ - writeDataFile (createFileName().append(".raw"), fdata, NULL, NULL, 'i'); - - /** rate correction */ - if (thisDetector->correctionMask&(1<nChans*thisDetector->nChips*thisDetector->nMods]; - rcerr=new float[thisDetector->nChans*thisDetector->nChips*thisDetector->nMods]; - rateCorrect(fdata,NULL,rcdata,rcerr); - delete [] fdata; - } else { - rcdata=fdata; - fdata=NULL; - } - - /** flat field correction */ - if (thisDetector->correctionMask&(1<nChans*thisDetector->nChips*thisDetector->nMods]; - ffcerr=new float[thisDetector->nChans*thisDetector->nChips*thisDetector->nMods]; - flatFieldCorrect(rcdata,rcerr,ffcdata,ffcerr); - delete [] rcdata; - delete [] rcerr; - } else { - ffcdata=rcdata; - ffcerr=rcerr; - rcdata=NULL; - rcerr=NULL; - } - - if (thisDetector->correctionMask&(1<< ANGULAR_CONVERSION)) { - - /** angular conversion */ - /** data merging */ - if (thisDetector->numberOfPositions) { - - if (currentPositionIndex==1) { - if (thisDetector->binSize>0) - bs=thisDetector->binSize; - else if (thisDetector->angOff[0].r_conversion>0) { - bs=180./PI*atan(thisDetector->angOff[0].r_conversion); - thisDetector->binSize=bs; - } else - thisDetector->binSize=bs; - - - nb=360./bs; - - mergingBins=new float[nb]; - mergingCounts=new float[nb]; - mergingErrors=new float[nb]; - mergingMultiplicity=new int[nb]; - - resetMerging(mergingBins, mergingCounts,mergingErrors, mergingMultiplicity); - } - addToMerging(ang, ffcdata, ffcerr, mergingBins, mergingCounts,mergingErrors, mergingMultiplicity); - if (currentPositionIndex==thisDetector->numberOfPositions) { - - - - - int np=finalizeMerging(mergingBins, mergingCounts,mergingErrors, mergingMultiplicity); - - - /** file writing */ - currentPositionIndex++; - writeDataFile (createFileName().append(".dat"),mergingCounts, mergingErrors, mergingBins,'f',np); - - delete [] mergingBins; - delete [] mergingCounts; - delete [] mergingErrors; - delete [] mergingMultiplicity; - - } - } else { - - ang=new float[thisDetector->nChans*thisDetector->nChips*thisDetector->nMods]; - for (int ip=0; ipnChans*thisDetector->nChips*thisDetector->nMods; ip++) { - imod==ip/(thisDetector->nChans*thisDetector->nChips); - ang[ip]=angle(ip,currentPosition,thisDetector->fineOffset+thisDetector->globalOffset,thisDetector->angOff[imod].r_conversion,thisDetector->angOff[imod].center, thisDetector->angOff[imod].offset,thisDetector->angOff[imod].tilt,thisDetector->angDirection); - } - writeDataFile (createFileName().append(".dat"), ffcdata, ffcerr,ang); - } - } else - writeDataFile (createFileName().append(".dat"), ffcdata, ffcerr); - - - - - - - - - - - - - if (ffcdata) - delete [] ffcdata; - if (ffcerr) - delete [] ffcerr; - if (ang) - delete [] ang; - - - - - - } - } - } -} /* diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h index 298a9faf1..177e9f537 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.h +++ b/slsDetectorSoftware/slsDetector/slsDetector.h @@ -22,6 +22,8 @@ extern "C" { #include +#include "sls_detector_defs.h" + #define MAX_TIMERS 10 #define MAX_ROIS 100 #define MAX_BADCHANS 2000 @@ -37,15 +39,13 @@ extern "C" { #define DEFAULT_HOSTNAME "localhost" #define DEFAULT_SHM_KEY 5678 -#define defaultTDead {170,90,750} +#define defaultTDead {170,90,750} /**< should be changed in order to have it separate for the different detector types */ using namespace std; /** \mainpage Common C++ library for SLS detectors data acquisition * * \section intro_sec Introduction - - * \subsection mot_sec Motivation Although the SLS detectors group delvelops several types of detectors (1/2D, counting/integrating etc.) it is common interest of the group to use a common platfor for data acquisition @@ -55,7 +55,13 @@ using namespace std; \li C++ classes common to all detectors for client-server communication. These can be supplied to users as libraries and embedded also in acquisition systems which are not developed by the SLS \sa MySocketTCP slsDetector \li the possibility of using a Qt-based graphical user interface (with eventually root analisys capabilities) \li the possibility of runnin alla commands from command line. In order to ensure a fast operation of this so called "text client" the detector parameters should not be re-initialized everytime. For this reason a shared memory block is allocated where the main detector flags and parameters are stored \sa slsDetector::sharedSlsDetector - + \section howto_sec How to use it + The best way to operate the slsDetectors is to use the software (text client or GUI) developed by the sls detectors group. +In case you need to embed the detector control in a previously existing software, compile these classes using
    +make package +
    +and link the shared library created to your software bin/libSlsDetector.so.1.0.1 +Then in your software you should use the class related to the detector you want to control (mythenDetector or eigerDetector). @author Anna Bergamaschi @@ -70,7 +76,7 @@ using namespace std; * * @short This is the base class for all SLS detector functionalities * @author Anna Bergamaschi - * @version 0.1alpha (any string) + * @version 0.1alpha */ @@ -89,8 +95,6 @@ class slsDetector { }; -#include "sls_detector_defs.h" - /** @short Structure allocated in shared memory to store detector settings and be accessed in parallel by several applications (take care of possible conflicts!) @@ -159,6 +163,8 @@ typedef struct sharedSlsDetector { float tDead; /** number of bad channels from bad channel list */ int nBadChans; + /** file with the bad channels */ + char badChanFile[MAX_STR_LENGTH]; /** list of bad channels */ int badChansList[MAX_BADCHANS]; /** number of bad channels from flat field i.e. channels which read 0 in the flat field file */ @@ -166,6 +172,8 @@ typedef struct sharedSlsDetector { /** list of bad channels from flat field i.e. channels which read 0 in the flat field file */ int badFFList[MAX_BADCHANS]; + /** file with the angular conversion factors */ + char angConvFile[MAX_STR_LENGTH]; /** array of angular conversion constants for each module \see ::angleConversionConstant */ angleConversionConstant angOff[MAXMODS]; /** angular direction (1 if it corresponds to the encoder direction i.e. channel 0 is 0, maxchan is positive high angle, 0 otherwise */ @@ -240,30 +248,18 @@ typedef struct sharedSlsDetector { int exists() {return thisDetector->alreadyExisting;}; /** - Every detector should have a basic configuration file containing: - type (mythen, pilatus etc.) - hostname - portnumber - communication type (default TCP/IP) - eventually secondary portnumber (e.g. mythen stop function) - number of modules installed if different from the detector size (x,y) - - to be changed + Purely virtual function + Should be implemented in the specific detector class + /sa mythenDetector::readConfigurationFile */ - int readConfigurationFile(string const fname); - /** - Every detector should have a basic configuration file containing: - type (mythen, pilatus etc.) - hostname - portnumber - communication type (default TCP/IP) - eventually secondary portnumber (e.g. mythen stop function) - number of modules installed if different from the detector size (x,y) - - to be changed + virtual int readConfigurationFile(string const fname)=0; + /** + Purely virtual function + Should be implemented in the specific detector class + /sa mythenDetector::writeConfigurationFile */ - int writeConfigurationFile(string const fname); + virtual int writeConfigurationFile(string const fname)=0; /* @@ -271,17 +267,18 @@ typedef struct sharedSlsDetector { in a file and retrieve it for repeating the measurement with identicals ettings, if necessary */ /** - not yet implemented - - should dump to a file all the current detector parameters + + Purely virtual function + Should be implemented in the specific detector class + /sa mythenDetector::dumpDetectorSetup */ - int dumpDetectorSetup(string const fname); + virtual int dumpDetectorSetup(string const fname)=0; /** - not yet implemented - - should retrieve from a file all the current detector parameters + Purely virtual function + Should be implemented in the specific detector class + /sa mythenDetector::retrieveDetectorSetup */ - int retrieveDetectorSetup(string const fname); + virtual int retrieveDetectorSetup(string const fname)=0; /** configure the socket communication and initializes the socket instances @@ -316,35 +313,39 @@ typedef struct sharedSlsDetector { \sa sharedSlsDetector */ - int getTrimEn(int *en) {for (int ien=0; iennTrimEn; ien++) en[ien]=thisDetector->trimEnergies[ien]; return (thisDetector->nTrimEn);}; + int getTrimEn(int *en=NULL) {if (en) {for (int ien=0; iennTrimEn; ien++) en[ien]=thisDetector->trimEnergies[ien];} return (thisDetector->nTrimEn);}; /** + Pure virtual function reads a trim file \param fname name of the file to be read \param myMod pointer to the module structure which has to be set.
    If it is NULL a new module structure will be created \returns the pointer to myMod or NULL if reading the file failed + \sa mythenDetector::readTrimFile */ - sls_detector_module* readTrimFile(string fname, sls_detector_module* myMod=NULL); + virtual sls_detector_module* readTrimFile(string fname, sls_detector_module* myMod=NULL)=0; /** + Pure virtual function writes a trim file \param fname name of the file to be written \param mod module structure which has to be written to file \returns OK or FAIL if the file could not be written - \sa ::sls_detector_module + \sa ::sls_detector_module mythenDetector::writeTrimFile(string, sls_detector_module) */ - int writeTrimFile(string fname, sls_detector_module mod); + virtual int writeTrimFile(string fname, sls_detector_module mod)=0; /** + Pure virtual function writes a trim file for module number imod - the values will be read from the current detector structure \param fname name of the file to be written \param imod module number \returns OK or FAIL if the file could not be written - \sa ::sls_detector_module sharedSlsDetector + \sa ::sls_detector_module sharedSlsDetector mythenDetector::writeTrimFile(string, int) */ - int writeTrimFile(string fname, int imod); + virtual int writeTrimFile(string fname, int imod)=0; /** sets the default output files path @@ -396,6 +397,7 @@ typedef struct sharedSlsDetector { string createFileName(); /** + Pure virtual function writes a data file \param name of the file to be written \param data array of data values @@ -405,20 +407,23 @@ typedef struct sharedSlsDetector { \param dataformat format of the data: can be 'i' integer or 'f' float (default) \param nch number of channels to be written to file. if -1 defaults to the number of installed channels of the detector \returns OK or FAIL if it could not write the file or data=NULL - + \sa mythenDetector::writeDataFile */ - int writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1); + virtual int writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1)=0; /** + Pure virtual function writes a data file \param name of the file to be written \param data array of data values - \returns OK or FAIL if it could not write the file or data=NULL + \returns OK or FAIL if it could not write the file or data=NULL + \sa mythenDetector::writeDataFile */ - int writeDataFile(string fname, int *data); + virtual int writeDataFile(string fname, int *data)=0; /** + Pure virtual function reads a data file \param name of the file to be read \param data array of data values to be filled @@ -429,64 +434,71 @@ typedef struct sharedSlsDetector { \param nch number of channels to be written to file. if <=0 defaults to the number of installed channels of the detector \returns OK or FAIL if it could not read the file or data=NULL - + \sa mythenDetector::readDataFile */ - int readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0); + virtual int readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=0)=0; /** + Pure virtual function reads a data file \param name of the file to be read \param data array of data values \returns OK or FAIL if it could not read the file or data=NULL + \sa mythenDetector::readDataFile */ - int readDataFile(string fname, int *data); + virtual int readDataFile(string fname, int *data)=0; /** returns the location of the calibration files \sa sharedSlsDetector */ - char* getCalDir() {return thisDetector->calDir;}; + char* getCalDir() {cout << "cal dir is " << thisDetector->calDir; return thisDetector->calDir;}; + + /** sets the location of the calibration files \sa sharedSlsDetector */ char* setCalDir(string s) {sprintf(thisDetector->calDir, s.c_str()); return thisDetector->calDir;}; /** + Pure virtual function reads a calibration file \param fname file to be read \param gain reference to the gain variable \offset reference to the offset variable - \sa sharedSlsDetector + \sa sharedSlsDetector mythenDetector::readCalibrationFile */ - int readCalibrationFile(string fname, float &gain, float &offset); + virtual int readCalibrationFile(string fname, float &gain, float &offset)=0; /** - writes a clibration file + Pure virtual function + writes a calibration file \param fname file to be written \param gain \param offset - \sa sharedSlsDetector + \sa sharedSlsDetector mythenDetector::writeCalibrationFile */ - int writeCalibrationFile(string fname, float gain, float offset); + virtual int writeCalibrationFile(string fname, float gain, float offset)=0; /** + Pure virtual function reads an angular conversion file \param fname file to be read - \sa angleConversionConstant + \sa angleConversionConstant mythenDetector::readAngularConversion */ - int readAngularConversion(string fname=""); + virtual int readAngularConversion(string fname="")=0; /** + Pure virtual function writes an angular conversion file \param fname file to be written - \sa angleConversionConstant + \sa angleConversionConstant mythenDetector::writeAngularConversion */ - int writeAngularConversion(string fname=""); + virtual int writeAngularConversion(string fname="")=0; /* Communication to server */ - // General purpose functions /** executes a system command on the server @@ -521,6 +533,14 @@ typedef struct sharedSlsDetector { void getDetectorType(char *type); + // Detector configuration functions + /** + set/get the size of the detector + \param n number of modules + \param d dimension + \returns current number of modules in direction d + */ + // Detector configuration functions /** set/get the size of the detector @@ -863,37 +883,16 @@ typedef struct sharedSlsDetector { */ int64_t getTimeLeft(timerIndex index); - /** - set clock divider - - not implemented (should be something more general like "set speed including also waitstates, set cycles etc.) - - */ - int setClockDivider(int i) {cout << "not implemented any longer!"<< endl; thisDetector->clkDiv=i;return thisDetector->clkDiv;}; - /** - get clock divider - - not implemented (should be something more general like "set speed including also waitstates, set cycles etc.) - - */ - int getClockDivider() {return thisDetector->clkDiv;}; - /** - set length cycles - - not implemented (should be something more general like "set speed including also waitstates, set cycles etc.) - - */ - int setSetLength(int i) {cout << "not implemented any longer!"<< endl; thisDetector->clkDiv=i;return 3;}; - /** - get length cycles - - not implemented (should be something more general like "set speed including also waitstates, set cycles etc.) - */ - int getSetLength() {return 3;}; - + /** sets/gets the value of important readout speed parameters + \param sp is the parameter to be set/get + \param value is the value to be set, if -1 get value + \returns current value for the specified parameter + \sa speedVariable + */ + int setSpeed(speedVariable sp, int value=-1); // Flags /** @@ -983,60 +982,95 @@ typedef struct sharedSlsDetector { */ int getBadChannelCorrections(int *bad=NULL); + /** returns the bad channel list file */ + char *getBadChannelCorrectionFile() {return thisDetector->badChanFile;}; + /** + pure virtual function set angular conversion \param fname file with angular conversion constants ("" disable) \returns 0 if angular conversion disabled, >0 otherwise + \sa mythenDetector::setAngularConversion */ - int setAngularConversion(string fname=""); + virtual int setAngularConversion(string fname="")=0; /** + pure virtual function get angular conversion \param reference to diffractometer direction \param angconv array that will be filled with the angular conversion constants \returns 0 if angular conversion disabled, >0 otherwise + \sa mythenDetector::getAngularConversion */ - int getAngularConversion(int &direction, angleConversionConstant *angconv=NULL); + virtual int getAngularConversion(int &direction, angleConversionConstant *angconv=NULL)=0; + + + /** + pure virtual function + returns the angular conversion file + \sa mythenDetector::getAngularConversion */ + virtual char *getAngularConversion()=0; /** + pure virtual function set detector global offset + \sa mythenDetector::setGlobalOffset */ - float setGlobalOffset(float f){thisDetector->globalOffset=f; return thisDetector->globalOffset;}; + virtual float setGlobalOffset(float f)=0; /** + pure virtual function set detector fine offset + \sa mythenDetector::setFineOffset */ - float setFineOffset(float f){thisDetector->fineOffset=f; return thisDetector->fineOffset;}; + virtual float setFineOffset(float f)=0; /** + pure virtual function get detector fine offset + \sa mythenDetector::getFineOffset */ - float getFineOffset(){return thisDetector->fineOffset;}; + virtual float getFineOffset()=0; /** + pure virtual function get detector global offset + \sa mythenDetector::getGlobalOffset */ - float getGlobalOffset(){return thisDetector->globalOffset;}; + virtual float getGlobalOffset()=0; /** + pure virtual function set positions for the acquisition \param nPos number of positions \param pos array with the encoder positions \returns number of positions + \sa mythenDetector::setPositions */ - int setPositions(int nPos, float *pos){thisDetector->numberOfPositions=nPos; for (int ip=0; ipdetPositions[ip]=pos[ip]; return thisDetector->numberOfPositions;}; + virtual int setPositions(int nPos, float *pos)=0; /** + pure virtual function get positions for the acquisition \param pos array which will contain the encoder positions \returns number of positions + \sa mythenDetector::getPositions */ - int getPositions(float *pos=NULL){ if (pos ) {for (int ip=0; ipnumberOfPositions; ip++) pos[ip]=thisDetector->detPositions[ip];} return thisDetector->numberOfPositions;}; + virtual int getPositions(float *pos=NULL)=0; - /** set detector bin size used for merging (approx angular resolution)*/ - float setBinSize(float bs) {thisDetector->binSize=bs; return thisDetector->binSize;} - /** return detector bin size used for merging (approx angular resolution)*/ - float getBinSize() {return thisDetector->binSize;} + /** pure virtual function + set detector bin size used for merging (approx angular resolution) + \param bs bin size in degrees + \returns current bin size + \sa mythenDetector::setBinSize +*/ + virtual float setBinSize(float bs)=0; + + /** pure virtual function + return detector bin size used for merging (approx angular resolution) + \sa mythenDetector::getBinSize + */ + virtual float getBinSize()=0; @@ -1100,16 +1134,20 @@ typedef struct sharedSlsDetector { int rateCorrect(float* datain, float *errin, float* dataout, float *errout); - /** sets the arrays of the merged data to 0. NB The array should be created with size >= 360./getBinSize(); + /** + pure virtual function + sets the arrays of the merged data to 0. NB The array should be created with size >= 360./getBinSize(); \param mp already merged postions \param mv already merged data \param me already merged errors (squared sum) \param mm multiplicity of merged arrays \returns OK or FAIL + \sa mythenDetector::resetMerging */ - int resetMerging(float *mp, float *mv,float *me, int *mm); - /** not yet implemented - merge dataset + virtual int resetMerging(float *mp, float *mv,float *me, int *mm)=0; + /** + pure virtual function + merge dataset \param p1 angular positions of dataset \param v1 data \param e1 errors @@ -1117,28 +1155,31 @@ typedef struct sharedSlsDetector { \param mv already merged data \param me already merged errors (squared sum) \param mm multiplicity of merged arrays + \sa mythenDetector::addToMerging */ - int addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv,float *me, int *mm); + virtual int addToMerging(float *p1, float *v1, float *e1, float *mp, float *mv,float *me, int *mm)=0; - /** + /** pure virtual function calculates the "final" positions, data value and errors for the emrged data \param mp already merged postions \param mv already merged data \param me already merged errors (squared sum) \param mm multiplicity of merged arrays - \returns FAIL or the + \returns FAIL or the number of non empty bins (i.e. points belonging to the pattern) + \sa mythenDetector::finalizeMerging */ int finalizeMerging(float *mp, float *mv,float *me, int *mm); /** - turns of server + turns off server */ int exitServer(); - /** + /** pure virtual function function for processing data + \sa mythenDetector::processData */ - void* processData(); // thread function + virtual void* processData()=0; // thread function /** Allocates the memory for a sls_detector_module structure and initializes it \returns myMod the pointer to the allocate dmemory location @@ -1152,7 +1193,17 @@ typedef struct sharedSlsDetector { void deleteModule(sls_detector_module *myMod); - void acquire(); + /** pure virtual function + performs the complete acquisition and data processing + moves the detector to next position
    + starts and reads the detector
    + reads the IC (if required)
    + reads the encoder (iof required for angualr conversion)
    + processes the data (flat field, rate, angular conversion and merging ::processData()) + \sa mythenDetector::acquire() + */ + + virtual void acquire()=0; protected: