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

slight cleanup of dumpDetectorSetup

Browse Source
This commit is contained in:
Erik Frojdh 2018-12-19 16:38:18 +01:00
parent 1ca8bf204a
commit 84a67870a0
1 changed files with 77 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -826,7 +826,7 @@ int multiSlsDetector::readConfigurationFile(const std::string &fname) {
std::string current_argument; std::string current_argument;
while (line_stream.good()) { while (line_stream.good()) {
line_stream >> current_argument; line_stream >> current_argument;
strcpy(myargs[n_arguments], current_argument.c_str()); sls::strcpy_safe(myargs[n_arguments], current_argument.c_str());
args[n_arguments] = myargs[n_arguments]; args[n_arguments] = myargs[n_arguments];
++n_arguments; ++n_arguments;
} }
@ -3252,114 +3252,112 @@ int multiSlsDetector::retrieveDetectorSetup(const std::string &fname1,
int multiSlsDetector::dumpDetectorSetup(const std::string &fname, int level) { int multiSlsDetector::dumpDetectorSetup(const std::string &fname, int level) {
detectorType type = getDetectorsType(); detectorType type = getDetectorsType();
std::string names[100]; // std::string names[100];
int nvar = 0; std::vector<std::string> names;
// int nvar = 0;
// common config // common config
names[nvar++] = "fname"; names.emplace_back("fname");
names[nvar++] = "index"; names.emplace_back("index");
names[nvar++] = "enablefwrite"; names.emplace_back("enablefwrite");
names[nvar++] = "overwrite"; names.emplace_back("overwrite");
names[nvar++] = "dr"; names.emplace_back("dr");
names[nvar++] = "settings"; names.emplace_back("settings");
names[nvar++] = "exptime"; names.emplace_back("exptime");
names[nvar++] = "period"; names.emplace_back("period");
names[nvar++] = "frames"; names.emplace_back("frames");
names[nvar++] = "cycles"; names.emplace_back("cycles");
names[nvar++] = "measurements"; names.emplace_back("measurements");
names[nvar++] = "timing"; names.emplace_back("timing");
switch (type) { switch (type) {
case EIGER: case EIGER:
names[nvar++] = "flags"; names.emplace_back("flags");
names[nvar++] = "clkdivider"; names.emplace_back("clkdivider");
names[nvar++] = "threshold"; names.emplace_back("threshold");
names[nvar++] = "ratecorr"; names.emplace_back("ratecorr");
names[nvar++] = "trimbits"; names.emplace_back("trimbits");
break; break;
case GOTTHARD: case GOTTHARD:
names[nvar++] = "delay"; names.emplace_back("delay");
break; break;
case JUNGFRAU: case JUNGFRAU:
names[nvar++] = "delay"; names.emplace_back("delay");
names[nvar++] = "clkdivider"; names.emplace_back("clkdivider");
break; break;
case CHIPTESTBOARD: case CHIPTESTBOARD:
names[nvar++] = "dac:0"; names.emplace_back("dac:0");
names[nvar++] = "dac:1"; names.emplace_back("dac:1");
names[nvar++] = "dac:2"; names.emplace_back("dac:2");
names[nvar++] = "dac:3"; names.emplace_back("dac:3");
names[nvar++] = "dac:4"; names.emplace_back("dac:4");
names[nvar++] = "dac:5"; names.emplace_back("dac:5");
names[nvar++] = "dac:6"; names.emplace_back("dac:6");
names[nvar++] = "dac:7"; names.emplace_back("dac:7");
names[nvar++] = "dac:8"; names.emplace_back("dac:8");
names[nvar++] = "dac:9"; names.emplace_back("dac:9");
names[nvar++] = "dac:10"; names.emplace_back("dac:10");
names[nvar++] = "dac:11"; names.emplace_back("dac:11");
names[nvar++] = "dac:12"; names.emplace_back("dac:12");
names[nvar++] = "dac:13"; names.emplace_back("dac:13");
names[nvar++] = "dac:14"; names.emplace_back("dac:14");
names[nvar++] = "dac:15"; names.emplace_back("dac:15");
names[nvar++] = "adcvpp"; names.emplace_back("adcvpp");
names[nvar++] = "adcclk"; names.emplace_back("adcclk");
names[nvar++] = "clkdivider"; names.emplace_back("clkdivider");
names[nvar++] = "adcphase"; names.emplace_back("adcphase");
names[nvar++] = "adcpipeline"; names.emplace_back("adcpipeline");
names[nvar++] = "adcinvert"; // names.emplace_back("adcinvert"); //
names[nvar++] = "adcdisable"; names.emplace_back("adcdisable");
names[nvar++] = "patioctrl"; names.emplace_back("patioctrl");
names[nvar++] = "patclkctrl"; names.emplace_back("patclkctrl");
names[nvar++] = "patlimits"; names.emplace_back("patlimits");
names[nvar++] = "patloop0"; names.emplace_back("patloop0");
names[nvar++] = "patnloop0"; names.emplace_back("patnloop0");
names[nvar++] = "patwait0"; names.emplace_back("patwait0");
names[nvar++] = "patwaittime0"; names.emplace_back("patwaittime0");
names[nvar++] = "patloop1"; names.emplace_back("patloop1");
names[nvar++] = "patnloop1"; names.emplace_back("patnloop1");
names[nvar++] = "patwait1"; names.emplace_back("patwait1");
names[nvar++] = "patwaittime1"; names.emplace_back("patwaittime1");
names[nvar++] = "patloop2"; names.emplace_back("patloop2");
names[nvar++] = "patnloop2"; names.emplace_back("patnloop2");
names[nvar++] = "patwait2"; names.emplace_back("patwait2");
names[nvar++] = "patwaittime2"; names.emplace_back("patwaittime2");
break; break;
default: default:
break; break;
} }
int iv = 0; //Workaround to bo able to suplly ecexuteLine with char**
std::string fname1; const int n_arguments = 1;
std::ofstream outfile; char buffer[1000]; //TODO! this should not be hardcoded!
char *args[4]; char *args[n_arguments] = { buffer };
for (int ia = 0; ia < 4; ia++) {
args[ia] = new char[1000];
}
std::string outfname;
if (level == 2) { if (level == 2) {
fname1 = fname + std::string(".config"); writeConfigurationFile(fname + ".config");
writeConfigurationFile(fname1); outfname = fname + ".det";
fname1 = fname + std::string(".det");
} else } else
fname1 = fname; outfname = fname;
outfile.open(fname1.c_str(), std::ios_base::out); std::ofstream outfile;
outfile.open(outfname.c_str(), std::ios_base::out);
if (outfile.is_open()) { if (outfile.is_open()) {
auto cmd = slsDetectorCommand(this); auto cmd = slsDetectorCommand(this);
for (iv = 0; iv < nvar; iv++) { for (int iv = 0; iv < names.size(); ++iv) {
strcpy(args[0], names[iv].c_str()); sls::strcpy_safe(buffer, names[iv].c_str()); //this is...
outfile << names[iv] << " " << cmd.executeLine(1, args, GET_ACTION) outfile << names[iv] << " " << cmd.executeLine(n_arguments, args, GET_ACTION)
<< std::endl; << std::endl;
} }
outfile.close(); outfile.close();
} else { } else {
FILE_LOG(logERROR) << "Could not open parameters file " << fname1 << " for writing"; FILE_LOG(logERROR) << "Could not open parameters file " << outfname << " for writing";
return FAIL; return FAIL;
} }
FILE_LOG(logDEBUG1) << "wrote " << iv << " lines to " << fname1; FILE_LOG(logDEBUG1) << "wrote " << names.size() << " lines to " << outfname;
return OK; return OK;
} }