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

removed measurments from ctb gui

Browse Source
This commit is contained in:
bergamaschi 2019-08-09 12:01:26 +02:00
parent 704a26af70
commit e7af4d7518
4 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ctbGui/ctbAcquisition.cpp
View File

@ -1133,13 +1133,12 @@ void ctbAcquisition::changePlot(){
if (rb2D->IsOn()) { if (rb2D->IsOn()) {
if (h2DMapDig) if (h2DMapDig)
h2DMapDig->Draw("colz"); h2DMapDig->Draw("colz");
else if (h1DMap)
h1DMap->Draw();
} else if (bitStack) } else if (bitStack)
bitStack->Draw("NOSTACK"); bitStack->Draw("NOSTACK");
else else
cout << "bitStack is NULL" << endl; cout << "bitStack is NULL" << endl;
} }

52
ctbGui/ctbPattern.cpp
View File

@ -510,24 +510,24 @@ ctbPattern::ctbPattern(TGVerticalFrame *page, multiSlsDetector *det)
e->Connect("ReturnPressed()","ctbPattern",this,"setCycles()"); e->Connect("ReturnPressed()","ctbPattern",this,"setCycles()");
sprintf(tit, "Number of measurements: "); // sprintf(tit, "Number of measurements: ");
label= new TGLabel(hframe, tit); // label= new TGLabel(hframe, tit);
hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1)); // hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
label->MapWindow(); // label->MapWindow();
label->SetTextJustify(kTextLeft); // label->SetTextJustify(kTextLeft);
eMeasurements = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger, // eMeasurements = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
TGNumberFormat::kNEANonNegative, // TGNumberFormat::kNEANonNegative,
TGNumberFormat::kNELNoLimits); // TGNumberFormat::kNELNoLimits);
hframe->AddFrame( eMeasurements,new TGLayoutHints(kLHintsTop | kLHintsExpandX, 1, 1, 1, 1)); // hframe->AddFrame( eMeasurements,new TGLayoutHints(kLHintsTop | kLHintsExpandX, 1, 1, 1, 1));
eMeasurements->MapWindow(); // eMeasurements->MapWindow();
eMeasurements->Resize(150,30); // eMeasurements->Resize(150,30);
e= eMeasurements->TGNumberEntry::GetNumberEntry(); // e= eMeasurements->TGNumberEntry::GetNumberEntry();
e->Connect("ReturnPressed()","ctbPattern",this,"setMeasurements()"); // e->Connect("ReturnPressed()","ctbPattern",this,"setMeasurements()");
hframe=new TGHorizontalFrame(this, 800,800); hframe=new TGHorizontalFrame(this, 800,800);
@ -910,14 +910,14 @@ try {
eCycles->SetNumber(n); eCycles->SetNumber(n);
try { // try {
myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1); // myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1);
} catch (...) { // } catch (...) {
cout << "Do nothing for this error" << endl; // cout << "Do nothing for this error" << endl;
} // }
eMeasurements->SetNumber(n); // eMeasurements->SetNumber(n);
start=-1; start=-1;
stop=-1; stop=-1;
@ -1049,14 +1049,14 @@ void ctbPattern::setCycles() {
} }
} }
void ctbPattern::setMeasurements() { // void ctbPattern::setMeasurements() {
try { // try {
myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,eFrames->GetNumber()); // myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,eFrames->GetNumber());
} catch (...) { // } catch (...) {
cout << "Do nothing for this error" << endl; // cout << "Do nothing for this error" << endl;
} // }
} // }

4
ctbGui/ctbPattern.h
View File

@ -100,7 +100,7 @@ private:
TGNumberEntry *eFrames; TGNumberEntry *eFrames;
TGNumberEntry *ePeriod; TGNumberEntry *ePeriod;
TGNumberEntry *eCycles; TGNumberEntry *eCycles;
TGNumberEntry *eMeasurements; // TGNumberEntry *eMeasurements;
TGNumberEntry *eAdcPipeline; TGNumberEntry *eAdcPipeline;
TGNumberEntry *eDBitPipeline; TGNumberEntry *eDBitPipeline;
@ -139,7 +139,7 @@ public:
void setDBitPipeline(); void setDBitPipeline();
void setFrames(); void setFrames();
void setCycles(); void setCycles();
void setMeasurements(); // void setMeasurements();
void setPeriod(); void setPeriod();

4
slsDetectorCalibration/dataStructures/deserializer.h
View File

@ -67,11 +67,11 @@ class deserializer : public slsDetectorData<int> {
} }
wp=(int64_t*)ptr; wp=(int64_t*)ptr;
for (iw=0; iw<nch*dr/nb; iw) { for (iw=0; iw<nch/nb; iw) {
word=*wp;; word=*wp;;
if (ioff<off) { if (ioff<off) {
ioff++; ioff++;
cout <<"*"; // cout <<"*";
} else { } else {
//if (idr<16) { //if (idr<16) {
ib=0; ib=0;