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

solved bug on retrieve detector setup?

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@195 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi 2012-06-19 13:33:00 +00:00
parent 7582cf9781
commit 98bf7a4c68
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1506,6 +1506,7 @@ int multiSlsDetector::setSpeed(speedVariable index, int value){
// Flags // Flags
int multiSlsDetector::setDynamicRange(int n, int pos){ int multiSlsDetector::setDynamicRange(int n, int pos){
// cout << "multi " << endl;
int imi, ima, i; int imi, ima, i;
int ret, ret1=-100; int ret, ret1=-100;
@ -1518,6 +1519,8 @@ int multiSlsDetector::setDynamicRange(int n, int pos){
} }
for (i=imi; i<ima; i++) { for (i=imi; i<ima; i++) {
// cout << "multi ************ detector " << i << endl;
if (detectors[i]) { if (detectors[i]) {
thisMultiDetector->dataBytes-=detectors[i]->getDataBytes(); thisMultiDetector->dataBytes-=detectors[i]->getDataBytes();
ret=detectors[i]->setDynamicRange(n); ret=detectors[i]->setDynamicRange(n);
@ -3088,12 +3091,6 @@ int multiSlsDetector::readConfigurationFile(string const fname){
} }
thisMultiDetector->numberOfDetectors=0; thisMultiDetector->numberOfDetectors=0;
multiSlsDetectorClient *cmd; multiSlsDetectorClient *cmd;
char ext[100]; char ext[100];

1
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3707,6 +3707,7 @@ int64_t slsDetector::getTimeLeft(timerIndex index){
// Flags // Flags
int slsDetector::setDynamicRange(int n){ int slsDetector::setDynamicRange(int n){
// cout << "single " << endl;
int fnum=F_SET_DYNAMIC_RANGE; int fnum=F_SET_DYNAMIC_RANGE;
int retval=-1; int retval=-1;
char mess[100]; char mess[100];

24
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -522,11 +522,12 @@ int slsDetectorUtils::retrieveDetectorSetup(string const fname1, int level){
ifstream infile; ifstream infile;
int iargval; int iargval;
int interrupt=0; int interrupt=0;
char *args[2]; char *args[10];
char myargs[2][1000]; char myargs[10][1000];
args[0]=myargs[0];
args[1]=myargs[1]; //args[0]=myargs[0];
//args[1]=myargs[1];
string sargname, sargval; string sargname, sargval;
int iline=0; int iline=0;
@ -565,6 +566,7 @@ int slsDetectorUtils::retrieveDetectorSetup(string const fname1, int level){
ssstr >> sargname; ssstr >> sargname;
// if (ssstr.good()) { // if (ssstr.good()) {
strcpy(myargs[iargval],sargname.c_str()); strcpy(myargs[iargval],sargname.c_str());
args[iargval]=myargs[iargval];
#ifdef VERBOSE #ifdef VERBOSE
std::cout<< args[iargval] << std::endl; std::cout<< args[iargval] << std::endl;
#endif #endif
@ -604,7 +606,7 @@ int slsDetectorUtils::retrieveDetectorSetup(string const fname1, int level){
int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){ int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){
slsDetectorCommand *cmd=new slsDetectorCommand(this); slsDetectorCommand *cmd;
string names[]={ string names[]={
"fname",\ "fname",\
@ -659,6 +661,11 @@ int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){
for (int ia=0; ia<2; ia++) { for (int ia=0; ia<2; ia++) {
args[ia]=new char[1000]; args[ia]=new char[1000];
} }
int nargs; int nargs;
if (level==2) if (level==2)
nargs=2; nargs=2;
@ -677,6 +684,7 @@ int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){
outfile.open(fname1.c_str(),ios_base::out); outfile.open(fname1.c_str(),ios_base::out);
if (outfile.is_open()) { if (outfile.is_open()) {
cmd=new slsDetectorCommand(this);
for (iv=0; iv<nvar-3; iv++) { for (iv=0; iv<nvar-3; iv++) {
strcpy(args[0],names[iv].c_str()); strcpy(args[0],names[iv].c_str());
outfile << names[iv] << " " << cmd->executeLine(1,args,GET_ACTION) << std::endl; outfile << names[iv] << " " << cmd->executeLine(1,args,GET_ACTION) << std::endl;
@ -701,8 +709,8 @@ int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){
strcpy(args[0],names[iv].c_str());
if (level==2) { if (level==2) {
strcpy(args[0],names[iv].c_str());
size_t c=fname.rfind('/'); size_t c=fname.rfind('/');
if (c<string::npos) { if (c<string::npos) {
fname1=fname.substr(0,c+1)+string("trim_")+fname.substr(c+1); fname1=fname.substr(0,c+1)+string("trim_")+fname.substr(c+1);
@ -713,13 +721,14 @@ int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){
#ifdef VERBOSE #ifdef VERBOSE
std::cout<< "writing to file " << fname1 << std::endl; std::cout<< "writing to file " << fname1 << std::endl;
#endif #endif
}
outfile << names[iv] << " " << cmd->executeLine(nargs,args,GET_ACTION) << std::endl; outfile << names[iv] << " " << cmd->executeLine(nargs,args,GET_ACTION) << std::endl;
iv++; iv++;
}
delete cmd;
outfile.close(); outfile.close();
} }
@ -732,7 +741,6 @@ int slsDetectorUtils::dumpDetectorSetup(string const fname, int level){
std::cout<< "wrote " <<iv << " lines to "<< fname1 << std::endl; std::cout<< "wrote " <<iv << " lines to "<< fname1 << std::endl;
#endif #endif
delete cmd;
return 0; return 0;
} }