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

changing pointers to local variables

Browse Source
This commit is contained in:
Erik Frojdh 2018-10-11 12:08:07 +02:00
parent 2216574d34
commit 6aa0029580
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -394,7 +394,7 @@ void multiSlsDetector::initSharedMemory(bool verify) {
// shared memory object with name // shared memory object with name
sharedMemory = new SharedMemory(detId, -1); sharedMemory = new SharedMemory(detId, -1);
size_t sz = sizeof(sharedMultiSlsDetector); size_t sz = sizeof(sharedMultiSlsDetector);
//create //create
if (!sharedMemory->IsExisting()) { if (!sharedMemory->IsExisting()) {
thisMultiDetector = (sharedMultiSlsDetector*)sharedMemory->CreateSharedMemory(sz); thisMultiDetector = (sharedMultiSlsDetector*)sharedMemory->CreateSharedMemory(sz);
@ -940,8 +940,6 @@ int multiSlsDetector::readConfigurationFile(std::string const fname) {
freeSharedMemory(); freeSharedMemory();
setupMultiDetector(); setupMultiDetector();
multiSlsDetectorClient* cmd;
std::string ans; std::string ans;
std::string str; std::string str;
std::ifstream infile; std::ifstream infile;
@ -995,8 +993,7 @@ int multiSlsDetector::readConfigurationFile(std::string const fname) {
std::cout << args[ia] << " ??????? "; std::cout << args[ia] << " ??????? ";
std::cout << std::endl; std::cout << std::endl;
#endif #endif
cmd = new multiSlsDetectorClient(iargval, args, PUT_ACTION, this); multiSlsDetectorClient(iargval, args, PUT_ACTION, this);
delete cmd;
} }
++iline; ++iline;
} }
@ -1043,18 +1040,18 @@ int multiSlsDetector::writeConfigurationFile(std::string const fname) {
outfile.open(fname.c_str(), std::ios_base::out); outfile.open(fname.c_str(), std::ios_base::out);
if (outfile.is_open()) { if (outfile.is_open()) {
slsDetectorCommand* cmd = new slsDetectorCommand(this); auto cmd = slsDetectorCommand(this);
// complete size of detector // complete size of detector
std::cout << iline << " " << names[iline] << std::endl; std::cout << iline << " " << names[iline] << std::endl;
strcpy(args[0], names[iline].c_str()); strcpy(args[0], names[iline].c_str());
outfile << names[iline] << " " << cmd->executeLine(1, args, GET_ACTION) << std::endl; outfile << names[iline] << " " << cmd.executeLine(1, args, GET_ACTION) << std::endl;
++iline; ++iline;
// hostname of the detectors // hostname of the detectors
std::cout << iline << " " << names[iline] << std::endl; std::cout << iline << " " << names[iline] << std::endl;
strcpy(args[0], names[iline].c_str()); strcpy(args[0], names[iline].c_str());
outfile << names[iline] << " " << cmd->executeLine(1, args, GET_ACTION) << std::endl; outfile << names[iline] << " " << cmd.executeLine(1, args, GET_ACTION) << std::endl;
++iline; ++iline;
// single detector configuration // single detector configuration
@ -1072,11 +1069,9 @@ int multiSlsDetector::writeConfigurationFile(std::string const fname) {
while (iline < nvar) { while (iline < nvar) {
std::cout << iline << " " << names[iline] << std::endl; std::cout << iline << " " << names[iline] << std::endl;
strcpy(args[0], names[iline].c_str()); strcpy(args[0], names[iline].c_str());
outfile << names[iline] << " " << cmd->executeLine(1, args, GET_ACTION) << std::endl; outfile << names[iline] << " " << cmd.executeLine(1, args, GET_ACTION) << std::endl;
++iline; ++iline;
} }
delete cmd;
outfile.close(); outfile.close();
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "wrote " << iline << " lines to configuration file " << std::endl; std::cout << "wrote " << iline << " lines to configuration file " << std::endl;
@ -3547,7 +3542,7 @@ int multiSlsDetector::retrieveDetectorSetup(std::string const fname1, int level)
infile.open(fname.c_str(), std::ios_base::in); infile.open(fname.c_str(), std::ios_base::in);
if (infile.is_open()) { if (infile.is_open()) {
cmd=new slsDetectorCommand(this); auto cmd = slsDetectorCommand(this);
while (infile.good() and interrupt==0) { while (infile.good() and interrupt==0) {
sargname="none"; sargname="none";
sargval="0"; sargval="0";
@ -3583,11 +3578,10 @@ int multiSlsDetector::retrieveDetectorSetup(std::string const fname1, int level)
skip=1; skip=1;
} }
if (skip==0) if (skip==0)
cmd->executeLine(iargval,args,PUT_ACTION); cmd.executeLine(iargval,args,PUT_ACTION);
} }
iline++; iline++;
} }
delete cmd;
infile.close(); infile.close();
} else { } else {
@ -3606,8 +3600,6 @@ int multiSlsDetector::retrieveDetectorSetup(std::string const fname1, int level)
int multiSlsDetector::dumpDetectorSetup(std::string const fname, int level){ int multiSlsDetector::dumpDetectorSetup(std::string const fname, int level){
slsDetectorCommand *cmd;
detectorType type = getDetectorsType(); detectorType type = getDetectorsType();
std::string names[100]; std::string names[100];
int nvar=0; int nvar=0;
@ -3709,14 +3701,11 @@ int multiSlsDetector::dumpDetectorSetup(std::string const fname, int level){
outfile.open(fname1.c_str(),std::ios_base::out); outfile.open(fname1.c_str(),std::ios_base::out);
if (outfile.is_open()) { if (outfile.is_open()) {
cmd=new slsDetectorCommand(this); auto cmd = slsDetectorCommand(this);
for (iv=0; iv<nvar; iv++) { for (iv=0; iv<nvar; 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;
} }
delete cmd;
outfile.close(); outfile.close();
} }
else { else {