detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 22:40:02 +02:00
Code Issues Actions Packages Releases Activity

commented out stuff to make sure they are not included

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@98 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-01-13 09:45:43 +00:00
parent fa369ca22f
commit 6abd580f95
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/gotthardDetector/gotthardDetector.cpp
View File

@ -16,7 +16,7 @@
eventually secondary portnumber (e.g. mythen stop function) eventually secondary portnumber (e.g. mythen stop function)
number of modules installed if different from the detector size (x,y) number of modules installed if different from the detector size (x,y)
*/ */
/*
int gotthardDetector::readConfigurationFile(string const fname){ int gotthardDetector::readConfigurationFile(string const fname){
string ans; string ans;
@ -123,6 +123,7 @@ int gotthardDetector::writeConfigurationFile(string const fname){
#endif #endif
return iv; return iv;
}; };
*/
/* /*
It should be possible to dump all the settings of the detector (including trimbits, threshold energy, gating/triggering, acquisition time etc. 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 in a file and retrieve it for repeating the measurement with identicals ettings, if necessary
@ -345,7 +346,7 @@ int gotthardDetector::retrieveDetectorSetup(string fname1, int level){
/* I/O */ /* I/O */
/*
sls_detector_module* gotthardDetector::readSettingsFile(string fname, sls_detector_module *myMod){ sls_detector_module* gotthardDetector::readSettingsFile(string fname, sls_detector_module *myMod){
int nflag=0; int nflag=0;
@ -459,7 +460,7 @@ int gotthardDetector::writeSettingsFile(string fname, int imod){
return writeSettingsFile(fname,detectorModules[imod]); return writeSettingsFile(fname,detectorModules[imod]);
}; };
*/
int gotthardDetector::writeDataFile(string fname, float *data, float *err, float *ang, char dataformat, int nch){ int gotthardDetector::writeDataFile(string fname, float *data, float *err, float *ang, char dataformat, int nch){

10
slsDetectorSoftware/gotthardDetector/gotthardDetector.h
View File

@ -42,12 +42,12 @@ class gotthardDetector : public slsDetector{
reads configuration file fname calling executeLine reads configuration file fname calling executeLine
\param fname file to be read \param fname file to be read
*/ */
int readConfigurationFile(string const fname); // int readConfigurationFile(string const fname);
/** /**
writes configuration file calling executeLine writes configuration file calling executeLine
\param fname file to write to \param fname file to write to
*/ */
int writeConfigurationFile(string const fname); // int writeConfigurationFile(string const fname);
/** /**
dumps all the possible detector parameters calling executeLine dumps all the possible detector parameters calling executeLine
\param fname file to write to \param fname file to write to
@ -67,7 +67,7 @@ class gotthardDetector : public slsDetector{
\returns the pointer to myMod or NULL if reading the file failed \returns the pointer to myMod or NULL if reading the file failed
*/ */
sls_detector_module* readSettingsFile(string fname, sls_detector_module* myMod=NULL); // sls_detector_module* readSettingsFile(string fname, sls_detector_module* myMod=NULL);
/** /**
writes a trim/settings file writes a trim/settings file
@ -77,7 +77,7 @@ class gotthardDetector : public slsDetector{
\sa ::sls_detector_module \sa ::sls_detector_module
*/ */
int writeSettingsFile(string fname, sls_detector_module mod); //int writeSettingsFile(string fname, sls_detector_module mod);
/** /**
writes a trim/settings file for module number imod - the values will be read from the current detector structure writes a trim/settings file for module number imod - the values will be read from the current detector structure
@ -86,7 +86,7 @@ class gotthardDetector : public slsDetector{
\returns OK or FAIL if the file could not be written \returns OK or FAIL if the file could not be written
\sa ::sls_detector_module sharedSlsDetector \sa ::sls_detector_module sharedSlsDetector
*/ */
int writeSettingsFile(string fname, int imod); //int writeSettingsFile(string fname, int imod);
/** /**
writes a data file writes a data file