detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-22 01:01:41 +01:00
Code Issues Actions Packages Releases Activity

Aldo Mozzanica added support for 2 modules in 1M configuration for root display

Browse Source
This commit is contained in:
maliakal_d
2026-01-21 11:14:48 +01:00
parent ae2e674772
commit 5742b8223f
5 changed files with 143 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
slsDetectorCalibration/jungfrauExecutables/Makefile.cluster_finder
View File

@@ -1,55 +0,0 @@
# SPDX-License-Identifier: LGPL-3.0-or-other
# Copyright (C) 2021 Contributors to the SLS Detector Package
#module add CBFlib/0.9.5
INCDIR=-I. -I../ -I../interpolations -I../interpolations/etaVEL -I../dataStructures -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ -I../tiffio/include
LDFLAG= ../tiffio/src/tiffIO.cpp -L/usr/lib64/ -lpthread -lm -lstdc++ -pthread -lrt -ltiff -O3 -std=c++11
MAIN=jungfrauClusterFinder.cpp
all: jungfrauRawDataProcess
jungfrauRawDataProcess: jungfrauRawDataProcess.cpp $(INCS) clean
g++ -o jungfrauRawDataProcess jungfrauRawDataProcess.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL
jungfrauClusterFinder: jungfrauClusterFinder.cpp $(INCS) clean
g++ -o jungfrauClusterFinder jungfrauClusterFinder.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL
jungfrauClusterFinderHighZ: jungfrauClusterFinder.cpp $(INCS) clean
g++ -o jungfrauClusterFinderHighZ jungfrauClusterFinder.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL -DHIGHZ
jungfrauClusterFinderStrx: jungfrauClusterFinder.cpp $(INCS) clean
g++ -o jungfrauClusterFinderStrx jungfrauClusterFinder.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL -DJFSTRX
jungfrauMakeEta: jungfrauInterpolation.cpp $(INCS) clean
g++ -o jungfrauMakeEta jungfrauInterpolation.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DFF
jungfrauInterpolation: jungfrauInterpolation.cpp $(INCS) clean
g++ -o jungfrauInterpolation jungfrauInterpolation.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF)
jungfrauNoInterpolation: jungfrauNoInterpolation.cpp $(INCS) clean
g++ -o jungfrauNoInterpolation jungfrauNoInterpolation.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF)
jungfrauPhotonCounter: jungfrauPhotonCounter.cpp $(INCS) clean
g++ -o jungfrauPhotonCounter jungfrauPhotonCounter.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DNEWRECEIVER
jungfrauAnalog: jungfrauPhotonCounter.cpp $(INCS) clean
g++ -o jungfrauAnalog jungfrauPhotonCounter.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DNEWRECEIVER -DANALOG
jungfrauPhotonCounterHighZ: jungfrauPhotonCounter.cpp $(INCS) clean
g++ -o jungfrauPhotonCounterHighZ jungfrauPhotonCounter.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DNEWRECEIVER -DHIGHZ
jungfrauAnalogHighZ: jungfrauPhotonCounter.cpp $(INCS) clean
g++ -o jungfrauAnalogHighZ jungfrauPhotonCounter.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DNEWRECEIVER -DANALOG -DHIGHZ
clean:
rm -f jungfrauClusterFinder jungfrauMakeEta jungfrauInterpolation jungfrauNoInterpolation jungfrauPhotonCounter jungfrauAnalog

17
slsDetectorCalibration/jungfrauExecutables/Makefile.zmqrootdisp
View File

@@ -1,17 +1,22 @@
ROOTSYS=/opt/cern/v6/root #ROOTSYS=/opt/cern/v6/root
ROOTSYS=/opt/cern/v6_RHEL8_from_src/build
#/afs/psi.ch/project/sls_det_sof/roottware/root_v5.34.23_sl6_64bit #/afs/psi.ch/project/sls_det_sof/roottware/root_v5.34.23_sl6_64bit
LIBZMQDIR = $(PWD) LIBZMQDIR = $(PWD)
LIBZMQ = -L$(LIBZMQDIR) -lzmq LIBZMQ = -L$(LIBZMQDIR) -lzmq
SHLIB_PATH=/opt/cern/v6/root/lib #SHLIB_PATH=/opt/cern/v6/root/lib
CMAKE_PREFIX_PATH=/opt/cern/v6/root SHLIB_PATH=/opt/cern/v6_RHEL8_from_src/build/lib
DYLD_LIBRARY_PATH=/opt/cern/v6/root/lib #CMAKE_PREFIX_PATH=/opt/cern/v6/root
CMAKE_PREFIX_PATH=/opt/cern/v6_RHEL8_from_src/build
#DYLD_LIBRARY_PATH=/opt/cern/v6/root/lib
DYLD_LIBRARY_PATH=/opt/cern/v6_RHEL8_from_src/build/lib
LD_LIBRARY_PATH=/home/l_msdetect/sls_det_package_9_2_0/slsDetectorPackage/build/bin
INCDIR= -I. -I../dataStructures ../tiffio/src/tiffIO.cpp -I../ -I../interpolations/ -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ -I../../libs/rapidjson/ -I../tiffio/include INCDIR= -I. -I../dataStructures ../tiffio/src/tiffIO.cpp -I../ -I../interpolations/ -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ -I../../libs/rapidjson/ -I../tiffio/include
LDFLAG= -L/usr/lib64/ -lpthread -lm -lstdc++ -lzmq -pthread -lrt -ltiff -O3 -std=c++11 -Wall -L../../build/bin/ -lSlsSupport #LDFLAG= -L/usr/lib64/ -lpthread -lm -lstdc++ -lzmq -pthread -lrt -ltiff -O3 -std=c++11 -Wall -L../../build/bin/ -lSlsSupport
LDFLAG= -L/usr/lib64/ -lpthread -lm -lstdc++ -lzmq -pthread -lrt -ltiff -O3 -std=c++17 -Wall -L../../build/bin/ -lSlsSupport
#-L../../bin -lhdf5 -L. #-L../../bin -lhdf5 -L.

160
slsDetectorCalibration/jungfrauExecutables/jungfrauClusterFinder.cpp
View File

@@ -1,160 +0,0 @@
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
//#include "sls/ansi.h"
#include <iostream>
//#include "moench03T1ZmqData.h"
#ifndef JFSTRX
#include "jungfrauHighZSingleChipData.h"
#endif
#ifdef JFSTRX
#include "jungfrauLGADStrixelsData.h"
#endif
#include "multiThreadedAnalogDetector.h"
#include "singlePhotonDetector.h"
#include <fstream>
#include <map>
#include <stdio.h>
#include <sys/stat.h>
#include <ctime>
using namespace std;
int main(int argc, char *argv[]) {
if (argc < 6) {
cout << "Usage is " << argv[0] << "indir outdir fname runmin runmax "
<< endl;
return 1;
}
int p = 10000;
int fifosize = 1000;
int nthreads = 1;
int nsubpix = 25;
int etabins = nsubpix * 10;
double etamin = -1, etamax = 2;
int csize = 3;
int nx = 400, ny = 400;
int save = 1;
int nsigma = 5;
int nped = 1000;
int ndark = 100;
int ok;
int iprog = 0;
#ifndef JFSTRX
jungfrauHighZSingleChipData *decoder = new jungfrauHighZSingleChipData();
#endif
#ifdef JFSTRX
cout << "bbb" << endl;
jungfrauLGADStrixelsData *decoder = new jungfrauLGADStrixelsData();
#endif
decoder->getDetectorSize(nx, ny);
cout << "nx " << nx << " ny " << ny << endl;
// moench03T1ZmqData *decoder=new moench03T1ZmqData();
singlePhotonDetector *filter =
new singlePhotonDetector(decoder, csize, nsigma, 1, 0, nped, 200);
// char tit[10000];
cout << "filter " << endl;
int *image;
filter->newDataSet();
int ff, np;
int dsize = decoder->getDataSize();
cout << " data size is " << dsize;
char data[dsize];
ifstream filebin;
char *indir = argv[1];
char *outdir = argv[2];
char *fformat = argv[3];
int runmin = atoi(argv[4]);
int runmax = atoi(argv[5]);
char fname[10000];
char outfname[10000];
char imgfname[10000];
char pedfname[10000];
char fn[10000];
std::time_t end_time;
FILE *of = NULL;
cout << "input directory is " << indir << endl;
cout << "output directory is " << outdir << endl;
cout << "fileformat is " << fformat << endl;
std::time(&end_time);
cout << std::ctime(&end_time) << endl;
char *buff;
multiThreadedAnalogDetector *mt =
new multiThreadedAnalogDetector(filter, nthreads, fifosize);
mt->setDetectorMode(ePhotonCounting);
mt->setFrameMode(eFrame);
mt->StartThreads();
mt->popFree(buff);
cout << "mt " << endl;
int ifr = 0;
for (int irun = runmin; irun < runmax; irun++) {
sprintf(fn, fformat, irun);
sprintf(fname, "%s/%s.dat", indir, fn);
sprintf(outfname, "%s/%s.clust", outdir, fn);
sprintf(imgfname, "%s/%s.tiff", outdir, fn);
std::time(&end_time);
cout << std::ctime(&end_time) << endl;
cout << fname << " " << outfname << " " << imgfname << endl;
filebin.open((const char *)(fname), ios::in | ios::binary);
// //open file
if (filebin.is_open()) {
of = fopen(outfname, "w");
if (of) {
mt->setFilePointer(of);
// cout << "file pointer set " << endl;
} else {
cout << "Could not open " << outfname << " for writing "
<< endl;
mt->setFilePointer(NULL);
return 1;
}
// //while read frame
ff = -1;
while (decoder->readNextFrame(filebin, ff, np, buff)) {
mt->pushData(buff);
mt->nextThread();
mt->popFree(buff);
ifr++;
if (ifr % 10000 == 0)
cout << ifr << " " << ff << endl;
ff = -1;
}
cout << "--" << endl;
filebin.close();
while (mt->isBusy()) {
;
} // wait until all data are processed from the queues
if (of)
fclose(of);
mt->writeImage(imgfname);
mt->clearImage();
std::time(&end_time);
cout << std::ctime(&end_time) << endl;
} else
cout << "Could not open " << fname << " for reading " << endl;
}
return 0;
}

151
slsDetectorCalibration/jungfrauExecutables/onlinedisp_zmq.cpp
View File

@@ -3,11 +3,16 @@ bool hasallpede;
TH1F * his102;TH1F * his101; TH1F * his102;TH1F * his101;
int processedf; int processedf;
sls::zmqHeader zHeader; sls::zmqHeader zHeader;
sls::zmqHeader zHeader2;
#define PEDEFNAME "current_pede.dat" #define PEDEFNAME "current_pede.dat"
#define NPRO 50 #define NPRO 50
#define NPRI 50 #define NPRI 50
#define JFSTRX #include "sls/sls_detector_defs.h"
#include "slsDetectorData.h"
//#define JFSTRX // comment for JF
#define JF1M
#ifdef JFSTRX #ifdef JFSTRX
#include "jungfrauLGADStrixelsData_new.h" #include "jungfrauLGADStrixelsData_new.h"
#include "sls/sls_detector_defs.h" #include "sls/sls_detector_defs.h"
@@ -59,8 +64,14 @@ int main(int argc, char* argv[])
#else #else
nx = 1024; ny= 512; nx = 1024;
#ifdef JF1M
scaler=2 ;
ny= 1024;
#else
scaler=1;
ny=512;
#endif
#endif #endif
@@ -73,10 +84,10 @@ int main(int argc, char* argv[])
HDraw_every=20; HDraw_every=20;
fixranges=false; fixranges=false;
int group;
hchptr = (short*) malloc(NCH*sizeof(short)); hchptr = (short*) malloc(NCH*sizeof(short));
startsocket(); //create and connect ZMQ startsocket(); //create and connect ZMQ
for (ipx=0;ipx<NCH;ipx++) hchptr[(ipx)]=0; for (ipx=0;ipx<NCH;ipx++) hchptr[(ipx)]=0;
@@ -123,16 +134,19 @@ int main(int argc, char* argv[])
his2000->GetZaxis()->SetRangeUser(0,4); his2000->GetZaxis()->SetRangeUser(0,4);
if (dophotonmap) { if (dophotonmap) {
his3000= new TH2F("his3000"," photon map ",1024,-0.5,1024-0.5,512,-0.5,512-0.5); his3000= new TH2F("his3000"," photon map ",nx,-0.5,nx-0.5,ny,-0.5,ny-0.5);
his1000->SetOption("colz");
} }
else { else {
his3000= new TH2F("his3000"," raw adc ",1024,-0.5,1024-0.5,512,-0.5,512-0.5); his3000= new TH2F("his3000"," raw adc ",nx,-0.5,nx-0.5,ny,-0.5,ny-0.5);
his1000->SetOption("colz");
} }
his4500= new TH2F("his4500","T vs B",101,-500,MAX_POS,101,-500,MAX_POS); his4500= new TH2F("his4500","T vs B",101,-300,MAX_POS/2,101,-300,MAX_POS/2);
hchip=new TH1I*[8]; hchip=new TH1I*[16];
#ifdef JFSTRX #ifdef JFSTRX
for (i=0;i<8;i++) { for (i=0;i<16;i++) {
if(i<3) if(i<3)
sprintf(hname,"%d_hchip1group%d",i,i+1); sprintf(hname,"%d_hchip1group%d",i,i+1);
else if (i>4) else if (i>4)
@@ -142,14 +156,14 @@ int main(int argc, char* argv[])
hchip[i] = new TH1I(hname,hname,NBIN,MIN_POS,MAX_POS); hchip[i] = new TH1I(hname,hname,NBIN,MIN_POS,MAX_POS);
} }
#else #else
for (i=0;i<8;i++) { for (i=0;i<16;i++) {
sprintf(hname,"hchip%d",i); sprintf(hname,"hchip%d",i);
hchip[i] = new TH1I(hname,hname,NBIN,MIN_POS,MAX_POS); hchip[i] = new TH1I(hname,hname,NBIN,MIN_POS,MAX_POS);
} }
#endif #endif
cout <<"end of histo booking" <<endl; cout <<"end of histo booking" <<endl;
if (A2==NULL) A2 = new TCanvas("A2","Plotting Canvas gain",150,10,500,250); if (A2==NULL) A2 = new TCanvas("A2","Plotting Canvas gain",150,10,500,250*scaler);
if (A3==NULL) { if (A3==NULL) {
#ifdef JFSTRX #ifdef JFSTRX
A3 = new TCanvas("A3","Plotting Canvas ADC",150,360,1200,750); A3 = new TCanvas("A3","Plotting Canvas ADC",150,360,1200,750);
@@ -172,13 +186,18 @@ int main(int argc, char* argv[])
// g=A3->cd(6); // g=A3->cd(6);
// g->SetCanvasSize( g->GetWw(), 2*g->GetWw()); // g->SetCanvasSize( g->GetWw(), 2*g->GetWw());
#else #else
A3 = new TCanvas("A3","Plotting Canvas ADC",150,360,1200,550); A3 = new TCanvas("A3","Plotting Canvas ADC",150,360,1200,550*scaler);
#endif #endif
} }
if (A4==NULL) A4 = new TCanvas("A4","Plotting Canvas PHs",750,300,1000,800); if (A4==NULL) A4 = new TCanvas("A4","Plotting Canvas PHs",750,300,1000,800*scaler);
A4->Clear(); A4->Clear();
#ifdef JF1M
A4->Divide(4,4,0.005,0.005);
#else
A4->Divide(4,2,0.005,0.005); A4->Divide(4,2,0.005,0.005);
if (A5==NULL) A5 = new TCanvas("A5","Plotting Canvas Photon Map",750,300,1000,600); #endif
if (A5==NULL) A5 = new TCanvas("A5","Plotting Canvas Photon Map",750,300,1000,600*scaler);
if (A6==NULL) A6 = new TCanvas("A6","Plotting Canvas LvsR",650,250,650,660); if (A6==NULL) A6 = new TCanvas("A6","Plotting Canvas LvsR",650,250,650,660);
gSystem->ProcessEvents(); gSystem->ProcessEvents();
@@ -198,8 +217,14 @@ int main(int argc, char* argv[])
else { else {
// if (((icount++)%10)==0) cout <<"recived frameindex "<<zHeader.frameIndex <<endl; // if (((icount++)%10)==0) cout <<"recived frameindex "<<zHeader.frameIndex <<endl;
//cout <<"there" <<endl;
zmqSocket->ReceiveData(0, (char *)(&image_data), NCH*2); zmqSocket->ReceiveData(0, (char *)(&image_data), NCH ); //(NCH/2*2)
#ifdef JF1M
zmqSocket2->ReceiveHeader(0,zHeader2, SLS_DETECTOR_JSON_HEADER_VERSION);
zmqSocket2->ReceiveData(0, (char *)(&image_data)+ NCH, NCH );//(NCH/2*2)
#endif
} }
{ {
@@ -210,14 +235,14 @@ int main(int argc, char* argv[])
ROIxmax=croi.xmax; ROIxmax=croi.xmax;
ROIymin=croi.ymin; ROIymin=croi.ymin;
ROIymax=croi.ymax; ROIymax=croi.ymax;
cout<<" ROIymin "<< ROIymin<<endl; if (ROIymin>0) cout<<" ROIymin "<< ROIymin<<endl;
framesinstream++; framesinstream++;
running++; running++;
fill1Ds=true; //alway fill 1d and LR plots fill1Ds=true; //alway fill 1d and LR plots
//if (((framesinstream%(int(HDraw_every)))==(int (HDraw_every)-1))) {fill1Ds=true;}else{fill1Ds=false;} //if (((framesinstream%(int(HDraw_every)))==(int (HDraw_every)-1))) {fill1Ds=true;}else{fill1Ds=false;}
if (((framesinstream%(HDraw_every))==(HDraw_every)-1)) {show2Ds=true;}else{show2Ds=false;} if (((framesinstream%(HDraw_every))==(HDraw_every)-1)) {show2Ds=true;}else{show2Ds=false;}
if (((framesinstream%NPRI)==NPRI-1)) { cout<<"\r "<<"frame (from start): "<<framesinstream<<" " << runc[((running/NPRI)%5)]<< " discarded frames %=" << (1-float(processedf)/float(zHeader.frameIndex-frameIndex_old))*100 << " current framenumber= " <<zHeader.frameIndex << " "<<std::flush; processedf=0;frameIndex_old=zHeader.frameIndex;} if (((framesinstream%NPRI)==NPRI-1)) { cout<<"\r "<<"frame (from start): "<<framesinstream<<" " << runc[((running/NPRI)%5)]<< " processed frames %=" << (float(processedf)/float(zHeader.frameIndex-frameIndex_old))*100 << " current framenumber= " <<zHeader.frameIndex << " "<<std::flush; processedf=0;frameIndex_old=zHeader.frameIndex;}
npacket=0; npacket=0;
@@ -299,7 +324,7 @@ int main(int argc, char* argv[])
hchip[ichip]->Fill(adcpedecorr,1); hchip[ichip]->Fill(adcpedecorr,1);
#endif #endif
// if (((i%256)<253)&&((i%256)>2)) his4500->Fill(adcpedecorrold,adcpedecorr,1); if (ichip<8) if (((i%256)<253)&&((i%256)>2)) his4500->Fill(adcpedecorrold,adcpedecorr,1);
adcpedecorrold=adcpedecorr; adcpedecorrold=adcpedecorr;
@@ -335,6 +360,8 @@ int main(int argc, char* argv[])
value= ((image_data[i]) & 0x3fff) -fpeded[i]; value= ((image_data[i]) & 0x3fff) -fpeded[i];
gain = (image_data[i]>>14) & 0x3;
#ifndef JFSTRX #ifndef JFSTRX
if ((i%256==0)||(i%256==255)) value=int(value/factor); if ((i%256==0)||(i%256==255)) value=int(value/factor);
if ((i/1024==255)||(i/1024==256)||(i/1024==767)||(i/1024==768)) value=int(value/factor); if ((i/1024==255)||(i/1024==256)||(i/1024==767)||(i/1024==768)) value=int(value/factor);
@@ -375,16 +402,28 @@ int main(int argc, char* argv[])
#else #else
his1000->Fill(float(ipx),float(ipy),value);
if (ipy>512) {
his1000->Fill(float(ipx),float(ipy+36),value);
}
else {
his1000->Fill(float(ipx),float(ipy),value);
}
#endif #endif
if (ipy>512) {
his2000->Fill(float(ipx),float(ipy+36) ,gain);
}
else {
his2000->Fill(float(ipx),float(ipy) ,gain); his2000->Fill(float(ipx),float(ipy) ,gain);
}
// if (!dophotonmap)his3000->Fill(float(ipx),float(ipy) ,value); // if (!dophotonmap)his3000->Fill(float(ipx),float(ipy) ,value);
// value=(int)(hchptr[i]); // value=(int)(hchptr[i]);
// if (dophotonmap) his3000->Fill(float(ipx),float(ipy),float(value)); // if (dophotonmap) his3000->Fill(float(ipx),float(ipy),float(value));
@@ -393,12 +432,18 @@ int main(int argc, char* argv[])
} //for ipy } //for ipy
for (ipx=0;ipx<1024;ipx++){ for (ipx=0;ipx<1024;ipx++){
#ifdef JF1M
for (ipy=0;ipy<1024;ipy++){
#else
for (ipy=0;ipy<512;ipy++){ for (ipy=0;ipy<512;ipy++){
#endif
i=ipx+ipy*1024; i=ipx+ipy*1024;
value= ((image_data[i]) & 0x3fff) -fpeded[i]; value= ((image_data[i]) & 0x3fff) -fpeded[i];
if (!dophotonmap)his3000->Fill(float(ipx),float(ipy) ,value); if (!dophotonmap)his3000->Fill(float(ipx),float(ipy) ,value);
value=(int)(hchptr[i]); value=(int)(hchptr[i]);
if (dophotonmap) his3000->Fill(float(ipx),float(ipy),float(value)); if (ipy>512) { if (dophotonmap) his3000->Fill(float(ipx),float(ipy+36),float(value)); }
else {if (dophotonmap) his3000->Fill(float(ipx),float(ipy),float(value)); }
} }
} }
@@ -518,7 +563,12 @@ void loadpede(void){
cout <<"received frameindex "<<zHeader.frameIndex << endl; cout <<"received frameindex "<<zHeader.frameIndex << endl;
zmqSocket->ReceiveData(0, (char *)(&image_data), NCH*2); zmqSocket->ReceiveData(0, (char *)(&image_data), NCH);
#ifdef JF1M
zmqSocket2->ReceiveHeader(0,zHeader2, SLS_DETECTOR_JSON_HEADER_VERSION);
zmqSocket2->ReceiveData(0, (char *)(&image_data)+NCH, NCH);
#endif
framesinstream++;nframes++; framesinstream++;nframes++;
for (ipx=0;ipx<NCH;ipx++) fpeded[ipx]=(fpeded[ipx]*(nframes-1)+(float)(image_data[ipx]&0x3fff))/(float)(nframes); for (ipx=0;ipx<NCH;ipx++) fpeded[ipx]=(fpeded[ipx]*(nframes-1)+(float)(image_data[ipx]&0x3fff))/(float)(nframes);
@@ -570,7 +620,7 @@ void historeset(){
his4500->Reset(); his4500->Reset();
his3000->Reset(); his3000->Reset();
for (i=0;i<8;i++) { for (i=0;i<16;i++) {
hchip[i]->Reset(); hchip[i]->Reset();
} }
@@ -635,7 +685,7 @@ void axisreset(){
his3000->GetZaxis()->UnZoom(); his3000->GetZaxis()->UnZoom();
for (i=0;i<8;i++) { for (i=0;i<16;i++) {
hchip[i]->GetXaxis()->UnZoom(); hchip[i]->GetXaxis()->UnZoom();
hchip[i]->GetYaxis()->UnZoom(); hchip[i]->GetYaxis()->UnZoom();
} }
@@ -725,20 +775,28 @@ void Plot1DHistos(void){
if (hchip[0]->GetXaxis()->GetLast()!=oldh0xlast){ if (hchip[0]->GetXaxis()->GetLast()!=oldh0xlast){
oldh0xlast=hchip[0]->GetXaxis()->GetLast(); oldh0xlast=hchip[0]->GetXaxis()->GetLast();
cout << oldh0xlast << endl;
oldh0xfirst=hchip[0]->GetXaxis()->GetFirst(); oldh0xfirst=hchip[0]->GetXaxis()->GetFirst();
for (int ipad=1; ipad<8;ipad++) { for (int ipad=1; ipad<16;ipad++) {
hchip[ipad]->GetXaxis()->SetRange(oldh0xfirst,oldh0xlast); hchip[ipad]->GetXaxis()->SetRange(oldh0xfirst,oldh0xlast);
} }
} }
#ifdef JF1M
for (int ipad=0; ipad<16;ipad++) {
#else
for (int ipad=0; ipad<8;ipad++) { for (int ipad=0; ipad<8;ipad++) {
#endif
A4->cd(ipad+1); A4->cd(ipad+1);
gStyle->SetOptStat(1); gPad->SetLogy(); gStyle->SetOptStat(1); gPad->SetLogy();
#ifdef JF1M
hchip[ipad%4+(3-int(ipad/4))*4]->Draw();
#else
hchip[ipad%4+(1-int(ipad/4))*4]->Draw(); hchip[ipad%4+(1-int(ipad/4))*4]->Draw();
#endif
} }
A4->cd(); A4->cd();
A4->Update(); A4->Update();
@@ -801,6 +859,7 @@ void Plot2DHistos(void){
A6->cd(); A6->cd();
his4500->Draw("colz"); his4500->Draw("colz");
gPad->SetLogz();
A6->Update(); A6->Update();
@@ -816,6 +875,9 @@ void startsocket(void) {
try { try {
zmqSocket = new sls::ZmqSocket(serverip, portnum); zmqSocket = new sls::ZmqSocket(serverip, portnum);
} catch (...) { } catch (...) {
cprintf(RED, cprintf(RED,
"Error: Could not create Zmq socket on port %d with ip %s\n", "Error: Could not create Zmq socket on port %d with ip %s\n",
@@ -824,12 +886,37 @@ void startsocket(void) {
return; return;
} }
zmqSocket->SetReceiveHighWaterMark(3); zmqSocket->SetReceiveHighWaterMark(3);
zmqSocket->SetReceiveBuffer(1024*1024); zmqSocket->SetReceiveBuffer(1024*5012*2);
zmqSocket->Connect(); zmqSocket->Connect();
cout<<"Zmq Client[] "<< zmqSocket->GetZmqServerAddress()<<endl; cout<<"Zmq Client[] "<< zmqSocket->GetZmqServerAddress()<<endl;
#ifdef JF1M
try {
zmqSocket2 = new sls::ZmqSocket(serverip, portnum+1);
} catch (...) {
cprintf(RED,
"Error: Could not create Zmq socket on port %d with ip %s\n",
portnum, serverip);
delete zmqSocket2;
return;
}
zmqSocket2->SetReceiveHighWaterMark(3);
zmqSocket2->SetReceiveBuffer(1024*5012*2);
zmqSocket2->Connect();
cout<<"Zmq Client[] "<< zmqSocket2->GetZmqServerAddress()<<endl;
#endif
haveconnection=true; haveconnection=true;
@@ -867,6 +954,12 @@ void stopsocket(void) {
zmqSocket=0; zmqSocket=0;
//zmqSocket->~ZmqSocket (); //zmqSocket->~ZmqSocket ();
#ifdef JF1M
delete zmqSocket2;
zmqSocket2=0;
#endif
haveconnection=false; haveconnection=false;

9
slsDetectorCalibration/jungfrauExecutables/onlinedisp_zmq.h
View File

@@ -80,12 +80,12 @@ using namespace sls;
#define FALSE 0 #define FALSE 0
#define OFFSET 0 #define OFFSET 0
#define NBIN 500 #define NBIN 250
#define MIN_POS -500.5 // 400.5 #define MIN_POS -500.5 // 400.5
#define MAX_POS 8499.5 //-100.5 #define MAX_POS 3500.5 //-100.5
#define NCH 524288 #define NCH 2*524288
// #define NCH 262144 in case of half_frames // #define NCH 262144 in case of half_frames
char serverip[256]; char serverip[256];
@@ -220,6 +220,7 @@ int ix,iy;
int adcmin,adcmax; int adcmin,adcmax;
int pmmin,pmmax; //min/mnx for the photon map int pmmin,pmmax; //min/mnx for the photon map
bool fixranges; bool fixranges;
int scaler;
sls::ZmqSocket *zmqSocket= NULL; sls::ZmqSocket *zmqSocket= NULL;
sls::ZmqSocket *zmqSocket2= NULL;