Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 33 → Rev 34

/sipmScan/sipmThreshold.prj
33,7 → 33,7
Path = "/c/HOME/dino/sipmScan/src/sipmThreshold.c"
Res Id = 2
Exclude = False
Disk Date = 3479104436
Disk Date = 3479113285
Project Flags = 0
Compile Into Object File = False
Object Format = "Win32-MSVC"
43,7 → 43,7
Window Left = 244
Window Height = 0
Window Width = 0
Source Window State = "1,349,349,349,0,29,30,0,0,108,0,0,0,0,0,55,512,0,539,36,"
Source Window State = "1,150,150,150,4,37,38,0,0,108,0,0,0,0,0,55,218,0,249,7,"
Header Dependencies Line0001 = "1,2,3,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,27,29,30,31,32,3"
Header Dependencies Line0002 = "3,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,55,56,57,58,"
 
183,18 → 183,22
Include Path 3 = "/c/HOME/dino/sipmScan/include"
 
[Included Headers]
Header 0055 = "/c/HOME/dino/sipmScan/include/sipmThreshold_ui.h"
Header 0058 = "/c/HOME/dino/sipmScan/include/camac.h"
Header 0029 = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL/wienvme_dll.h"
Header 0059 = "/c/HOME/dino/sipmScan/include/sipmScan_ui.h"
Header 0058 = "/c/HOME/dino/sipmScan/include/camac.h"
Header 0001 = "/c/MeasurementStudio/cvi/include/utility.h"
Header 0002 = "/c/MeasurementStudio/cvi/include/cvidef.h"
Header 0003 = "/c/MeasurementStudio/cvi/include/cvirte.h"
Header 0005 = "/c/MeasurementStudio/cvi/include/ansi_c.h"
Header 0006 = "/c/MeasurementStudio/cvi/include/ansi/assert.h"
Header 0007 = "/c/MeasurementStudio/cvi/include/ansi/ctype.h"
Header 0008 = "/c/MeasurementStudio/cvi/include/ansi/errno.h"
Header 0009 = "/c/MeasurementStudio/cvi/include/ansi/float.h"
Header 0010 = "/c/MeasurementStudio/cvi/include/ansi/limits.h"
Header 0011 = "/c/MeasurementStudio/cvi/include/ansi/locale.h"
Header 0012 = "/c/MeasurementStudio/cvi/include/ansi/math.h"
Header 0013 = "/c/MeasurementStudio/cvi/include/ansi/setjmp.h"
Header 0014 = "/c/MeasurementStudio/cvi/include/ansi/signal.h"
Header 0015 = "/c/MeasurementStudio/cvi/include/ansi/stdarg.h"
Header 0016 = "/c/MeasurementStudio/cvi/include/ansi/stddef.h"
Header 0017 = "/c/MeasurementStudio/cvi/include/ansi/stdio.h"
205,6 → 209,7
Header 0022 = "/c/MeasurementStudio/cvi/include/ivi.h"
Header 0023 = "/c/MeasurementStudio/cvi/include/visa.h"
Header 0024 = "/c/MeasurementStudio/cvi/include/visatype.h"
Header 0025 = "/c/MeasurementStudio/cvi/include/vpptype.h"
Header 0027 = "/c/MeasurementStudio/cvi/instr/CAENV673A/CAENV673A.h"
Header 0030 = "/c/MeasurementStudio/cvi/sdk/include/windows.h"
Header 0031 = "/c/MeasurementStudio/cvi/sdk/include/windef.h"
211,11 → 216,23
Header 0032 = "/c/MeasurementStudio/cvi/sdk/include/winnt.h"
Header 0033 = "/c/MeasurementStudio/cvi/sdk/include/basetsd.h"
Header 0034 = "/c/MeasurementStudio/cvi/sdk/include/Guiddef.h"
Header 0035 = "/c/MeasurementStudio/cvi/sdk/include/pshpack4.h"
Header 0036 = "/c/MeasurementStudio/cvi/sdk/include/poppack.h"
Header 0037 = "/c/MeasurementStudio/cvi/sdk/include/pshpack2.h"
Header 0038 = "/c/MeasurementStudio/cvi/sdk/include/pshpack8.h"
Header 0039 = "/c/MeasurementStudio/cvi/sdk/include/winbase.h"
Header 0040 = "/c/MeasurementStudio/cvi/sdk/include/winerror.h"
Header 0041 = "/c/MeasurementStudio/cvi/sdk/include/wingdi.h"
Header 0042 = "/c/MeasurementStudio/cvi/sdk/include/pshpack1.h"
Header 0043 = "/c/MeasurementStudio/cvi/sdk/include/winuser.h"
Header 0044 = "/c/MeasurementStudio/cvi/sdk/include/tvout.h"
Header 0045 = "/c/MeasurementStudio/cvi/sdk/include/winnls.h"
Header 0046 = "/c/MeasurementStudio/cvi/sdk/include/wincon.h"
Header 0047 = "/c/MeasurementStudio/cvi/sdk/include/winver.h"
Header 0048 = "/c/MeasurementStudio/cvi/sdk/include/winreg.h"
Header 0049 = "/c/MeasurementStudio/cvi/sdk/include/winnetwk.h"
Header 0050 = "/c/MeasurementStudio/cvi/sdk/include/winsvc.h"
Header 0051 = "/c/MeasurementStudio/cvi/sdk/include/mcx.h"
Header 0052 = "/c/MeasurementStudio/cvi/sdk/include/imm.h"
Header 0053 = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462.h"
Header 0056 = "/c/MeasurementStudio/cvi/include/userint.h"
224,29 → 241,11
Header 0026 = "/c/MeasurementStudio/cvi/include/rs232.h"
Header 0028 = "/c/MeasurementStudio/cvi/instr/CAENV673A/CAENV673A_DEF.h"
Header 0054 = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462_DEF.h"
Header 0055 = "/c/HOME/dino/sipmScan/include/sipmThreshold_ui.h"
Header 0006 = "/c/MeasurementStudio/cvi/include/ansi/assert.h"
Header 0010 = "/c/MeasurementStudio/cvi/include/ansi/limits.h"
Header 0012 = "/c/MeasurementStudio/cvi/include/ansi/math.h"
Header 0014 = "/c/MeasurementStudio/cvi/include/ansi/signal.h"
Header 0025 = "/c/MeasurementStudio/cvi/include/vpptype.h"
Header 0035 = "/c/MeasurementStudio/cvi/sdk/include/pshpack4.h"
Header 0036 = "/c/MeasurementStudio/cvi/sdk/include/poppack.h"
Header 0037 = "/c/MeasurementStudio/cvi/sdk/include/pshpack2.h"
Header 0038 = "/c/MeasurementStudio/cvi/sdk/include/pshpack8.h"
Header 0040 = "/c/MeasurementStudio/cvi/sdk/include/winerror.h"
Header 0042 = "/c/MeasurementStudio/cvi/sdk/include/pshpack1.h"
Header 0044 = "/c/MeasurementStudio/cvi/sdk/include/tvout.h"
Header 0046 = "/c/MeasurementStudio/cvi/sdk/include/wincon.h"
Header 0047 = "/c/MeasurementStudio/cvi/sdk/include/winver.h"
Header 0048 = "/c/MeasurementStudio/cvi/sdk/include/winreg.h"
Header 0049 = "/c/MeasurementStudio/cvi/sdk/include/winnetwk.h"
Header 0051 = "/c/MeasurementStudio/cvi/sdk/include/mcx.h"
Max Header Number = 59
Max Header Number = 58
 
[Create Executable]
Executable File_Debug = "/c/HOME/dino/sipmScan/sipmThr_dbg.exe"
Target Creation Date_Debug = 3479104583
Target Creation Date_Debug = 3479113436
Force Creation of Target_Debug = False
Executable File_Release = "/c/HOME/dino/sipmScan/sipmThr.exe"
Target Creation Date_Release = 0
/sipmScan/sipmBias.prj
4,7 → 4,7
Pathname = "/c/HOME/dino/sipmScan/sipmBias.prj"
CVI Dir = "/c/measurementstudio/cvi"
VXIplug&play Framework Dir = "/C/VXIpnp/winnt"
Number of Files = 8
Number of Files = 9
Sort Type = "No Sort"
Target Type = "Executable"
Build Configuration = "Debug"
11,10 → 11,10
Warn User If Debugging Release = 1
Flags = 17
Drag Bar Left = 354
Window Top = 478
Window Left = 778
Window Bottom = 982
Window Right = 1522
Window Top = 525
Window Left = 811
Window Bottom = 1029
Window Right = 1555
 
[File 0001]
File Type = "User Interface Resource"
21,34 → 21,50
Path = "/c/HOME/dino/sipmScan/include/sipmBias_ui.uir"
Res Id = 1
Exclude = False
Disk Date = 3479111557
Disk Date = 3479210454
Project Flags = 0
Window Top = 0
Window Left = 0
Window Top = 92
Window Left = 38
Window Height = 847
Window Width = 1180
 
[File 0002]
File Type = "Include"
Path = "/c/HOME/dino/sipmScan/include/sipmBias_ui.h"
Res Id = 2
Exclude = False
Disk Date = 3479210454
Project Flags = 0
Window Top = 302
Window Left = 150
Window Height = 0
Window Width = 0
Source Window State = "1,0,0,0,0,0,0,0,0,85,0,0,0,0,0,25,0,0,0,0,"
 
[File 0002]
[File 0003]
File Type = "CSource"
Path = "/c/HOME/dino/sipmScan/src/sipmBias.c"
Res Id = 2
Res Id = 3
Exclude = False
Disk Date = 3479111999
Disk Date = 3479210498
Project Flags = 0
Compile Into Object File = False
Object Format = "Unknown"
ForceCompile_Debug = True
Object Format = "Win32-MSVC"
ForceCompile_Debug = False
ForceCompile_Release = True
Window Top = 122
Window Left = 54
Window Top = 112
Window Left = 206
Window Height = 0
Window Width = 0
Source Window State = "1,150,150,150,4,37,38,0,0,146,0,0,0,0,0,53,117,0,149,33,"
Source Window State = "1,265,267,267,0,31,32,0,0,146,0,606,0,623,60,52,282,0,308,31,"
Header Dependencies Line0001 = "1,2,3,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,27,29,30,31,32,3"
Header Dependencies Line0002 = "3,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,55,56,57,58,"
Breakpoint 0001 = "371,0,disabled,"
 
[File 0003]
[File 0004]
File Type = "Include"
Path = "/c/HOME/dino/sipmScan/include/camac.h"
Res Id = 3
Res Id = 4
Exclude = False
Disk Date = 3261994151
Project Flags = 0
58,10 → 74,10
Window Width = 0
Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
 
[File 0004]
[File 0005]
File Type = "Include"
Path = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL/wienvme_dll.h"
Res Id = 4
Res Id = 5
Exclude = False
Disk Date = 3263052572
Project Flags = 0
71,10 → 87,10
Window Width = 0
Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
 
[File 0005]
[File 0006]
File Type = "Function Panel"
Path = "/c/MeasurementStudio/cvi/instr/MIKRO/MIKRO.fp"
Res Id = 5
Res Id = 6
Exclude = False
Disk Date = 3228639698
Project Flags = 0
83,10 → 99,10
Window Height = 0
Window Width = 0
 
[File 0006]
[File 0007]
File Type = "Function Panel"
Path = "/c/MeasurementStudio/cvi/instr/CAENV673A/CAENV673A.fp"
Res Id = 6
Res Id = 7
Exclude = False
Disk Date = 3244094708
Project Flags = 0
95,10 → 111,10
Window Height = 0
Window Width = 0
 
[File 0007]
[File 0008]
File Type = "Function Panel"
Path = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL/wienvme_dll.fp"
Res Id = 7
Res Id = 8
Exclude = False
Disk Date = 3258264254
Project Flags = 0
107,10 → 123,10
Window Height = 0
Window Width = 0
 
[File 0008]
[File 0009]
File Type = "Function Panel"
Path = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462.fp"
Res Id = 8
Res Id = 9
Exclude = False
Disk Date = 3243842134
Project Flags = 0
168,7 → 184,7
Include Path 3 = "/c/HOME/dino/sipmScan/include"
 
[Included Headers]
Header 0057 = "/c/HOME/dino/sipmScan/include/camac.h"
Header 0055 = "/c/HOME/dino/sipmScan/include/camac.h"
Header 0029 = "/c/MeasurementStudio/cvi/instr/WIENVME_DLL/wienvme_dll.h"
Header 0001 = "/c/MeasurementStudio/cvi/include/utility.h"
Header 0002 = "/c/MeasurementStudio/cvi/include/cvidef.h"
223,13 → 239,16
Header 0052 = "/c/MeasurementStudio/cvi/sdk/include/imm.h"
Header 0053 = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462.h"
Header 0054 = "/c/MeasurementStudio/cvi/instr/CAENV462/CAENV462_DEF.h"
Max Header Number = 57
Header 0056 = "/c/MeasurementStudio/cvi/include/userint.h"
Header 0057 = "/c/MeasurementStudio/cvi/include/analysis.h"
Header 0058 = "/c/HOME/dino/sipmScan/include/sipmBias_ui.h"
Max Header Number = 58
 
[Create Executable]
Executable File_Debug = "/c/HOME/dino/sipmScan/sipmThr_dbg.exe"
Target Creation Date_Debug = 3479104583
Force Creation of Target_Debug = True
Executable File_Release = "/c/HOME/dino/sipmScan/sipmThr.exe"
Executable File_Debug = "/c/HOME/dino/sipmScan/sipmBias_dbg.exe"
Target Creation Date_Debug = 3479210500
Force Creation of Target_Debug = False
Executable File_Release = "/c/HOME/dino/sipmScan/sipmBias.exe"
Target Creation Date_Release = 0
Force Creation of Target_Release = True
Icon File = ""
/sipmScan/include/sipmBias_ui.uir
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/sipmScan/include/RTUtil.h
30,7 → 30,7
void Update();
};
//##########################################################################################
#include "RTUtil.cpp"
#include "src/RTUtil.cpp"
 
#endif
 
/sipmScan/src/analysisBias.cpp
38,12 → 38,14
#define POSREC_ID 3
#define EVTREC_ID 4
#define THRREC_ID 5
#define BIASREC_ID 6
 
typedef struct {
unsigned int id,len;
unsigned int fver,time;
unsigned int thLow, thUp, thStep;
unsigned int biasLow, biasUp, biasStep;
unsigned int nev,nch,ped,xy;
unsigned int thLow, thUp, thStep;
int nx,x0,dx,ny,y0,dy;
} RUNREC;
RUNREC *runrec;
83,6 → 85,14
THRREC *thrrec;
THRREC thr;
 
typedef struct {
unsigned int id;
unsigned int len;
unsigned int bias;
} BIASREC;
BIASREC *biasrec;
BIASREC bias;
 
double padCenter[NCH][2];
 
int position(int, int, int);
89,7 → 99,7
 
// ------------------------------------------------------------------------------
 
int d2r(char* dfile0="test", int dbg=0, double tdcCut=5.0)
int analysisBias(char* dfile0="test", int dbg=0, double tdcCut=5.0)
{
 
const double c_tdcOffset = +2.5; // ns
162,6 → 172,7
TH2F *h2d[NCH];
TH2F *h_threshold;
TH2F *h_ch33;
TH2F *h_bias;
TNtuple *nt;
247,6 → 258,7
printf("nx = %d, x0 = %d, dx = %d\n", run.nx, run.x0, run.dx);
printf("ny = %d, y0 = %d, dy = %d\n", run.ny, run.y0, run.dy);
printf("thLow = %d, thUp = %d, thStep = %d\n", run.thLow, run.thUp, run.thStep);
printf("biasLow = %d, biasUp = %d, biasStep = %d\n", run.biasLow, run.biasUp, run.biasStep);
}
//create histograms
259,6 → 271,7
if (h_correctedTDC) delete h_correctedTDC;
h_correctedTDC = new TH2F("h_correctedTDC","Corrected TDC;t [ns];SiPM channel",33, -16.5*TDC_BIN,16.5*TDC_BIN,NCH,0,NCH);
//TH1F* gsumV673A[NCH/16] = new TH1F(hn,hname,256,-0.5,255.5);
h_bias = new TH2F("h_bias","",20, 71.0, 73.0, 33, -16.5*TDC_BIN, 16.5*TDC_BIN);
for(int i=0; i<NCH; i++) {
/*
sprintf(hname, "htdcpos%d", i);
393,6 → 406,7
hnhitsy[channel]->Fill((pos.yset - OFFSETY) * MIKRO_BIN);
h2d[channel]->Fill((pos.xset - OFFSETX) * MIKRO_BIN, (pos.yset - OFFSETY) * MIKRO_BIN);
//h_threshold->Fill(channel, thr.threshold);
h_bias->Fill(bias.bias/1000.0, (time-tdcOffset[channel]));
if (position(pos.xset-OFFSETX, pos.yset-OFFSETY, channel)) {
h_ch33->Fill(pos.xset-OFFSETX, pos.yset-OFFSETY);
h_threshold->Fill(channel, thr.threshold);
450,6 → 464,14
if (dbg) printf("THRREC id = %d len = %d threshold %d\n",
thrrec->id, thrrec->len, thrrec->threshold);
break;
case BIASREC_ID:
status = gzread(dfp, (voidp)&readbuf[2], (rec_len-2*ulsize));
biasrec = (BIASREC*) readbuf;
bias = *biasrec;
if (dbg) printf("BIASREC id = %d len = %d bias %d\n",
bias.id, bias.len, bias.bias);
break;
case ENDREC_ID:
gzread(dfp, (voidp)&readbuf[2], (rec_len-2*ulsize));
/sipmScan/src/sipmBias.c
13,7 → 13,8
# include "wienvme_dll.h"
# endif
# include "CAENV673A.h"
# include "CAENV462.h"
# include "CAENV462.h"
 
#endif
 
#ifdef USE_MIKRO
30,8 → 31,10
#ifdef USE_DAQ
# define USE_CAMAC
# include "camac.h"
# define NDAC 1
 
# define NDAC 1 // CAEN C221
# define ASD8 0 // channels
# define AMPDISSH 1
# define SIPM 2
# define CAEN_V673A 0x22220000 // IJS
//#define CAEN_V673A 0x10110000 // FMF
# define CAEN_V462 0x100300
53,6 → 56,7
#define IWAIT 200
 
#define NCH 64
#define POWERSUPPLY 66 // Power supply voltage for SiPM bias
 
static int p1h, pID, rID, tfID;
static int ph_tdc, ph_adc;
138,15 → 142,18
unsigned long *pdata;
 
FILE *fp;
#define RUNREC_ID 1
#define ENDREC_ID 2
#define POSREC_ID 3
#define EVTREC_ID 4
#define THRREC_ID 5
#define RUNREC_ID 1
#define ENDREC_ID 2
#define POSREC_ID 3
#define EVTREC_ID 4
#define THRREC_ID 5
#define BIASREC_ID 6
 
typedef struct {
unsigned long id,len;
unsigned long fver,time;
unsigned long thLow, thUp, thStep;
unsigned long biasLow, biasUp, biasStep;
unsigned long nev,nch,ped,xy;
long nx,x0,dx,ny,y0,dy;
} RUNREC;
175,14 → 182,23
typedef struct {
unsigned long id;
unsigned long len;
unsigned long thLow, thUp, thStep;
unsigned long threshold;
} THRREC;
THRREC thrrec;
typedef struct {
unsigned long id;
unsigned long len;
unsigned long bias;
} BIASREC;
BIASREC biasrec;
double thresholdLow;
double thresholdUp;
double thresholdStep;
double biasLow;
double biasUp;
double biasStep;
 
#define BSIZE 20000
205,6 → 221,8
evtrec.len = sizeof(evtrec);
thrrec.id = THRREC_ID;
thrrec.len = sizeof(thrrec);
biasrec.id = BIASREC_ID;
biasrec.len = sizeof(biasrec);
cres = 0;
241,7 → 259,7
GetCtrlVal (p1h, P1_FRAC, &frac);
}
GetCtrlVal (p1h, P1_STHRLOW, &thresholdLow);
GetCtrlVal (p1h, P1_SASD8THR, &thresholdLow);
runrec.thLow = thresholdLow*1000; // mV
GetCtrlVal (p1h, P1_STHRUP, &thresholdUp);
runrec.thUp = thresholdUp*1000; // mV
248,6 → 266,12
GetCtrlVal (p1h, P1_STEP, &thresholdStep);
runrec.thStep = thresholdStep*1000; // mV
GetCtrlVal (p1h, P1_SBIAS, &biasLow);
GetCtrlVal (p1h, P1_SBIASUP, &biasUp);
GetCtrlVal (p1h, P1_SBIASSTEP, &biasStep);
runrec.biasLow = biasLow*1000;
runrec.biasUp = biasUp*1000;
runrec.biasStep = biasStep*1000;
 
#ifdef USE_DAQ
V673A_map(0,CAEN_V673A,0);
268,12 → 292,21
fseed = runrec.time & 0x7fffffff;
Uniform (1, fseed, &fracg);
}
 
// Set SiPM bias voltage
//SetDac(SIPM, 1.0);
biasrec.bias = runrec.biasLow;
while (biasrec.bias <= runrec.biasUp) {
SetDac(SIPM, biasrec.bias/1000.0 - POWERSUPPLY);
SetCtrlVal(p1h, P1_SBIAS, biasrec.bias/1000.0);
status = fwrite(&biasrec, 1, biasrec.len, fp);
if (print) printf("BIASREC status %d len %d bias %d\n", status, biasrec.len, biasrec.bias);
// Set ASD threshold voltage
thrrec.threshold = (unsigned long) ceil(thresholdLow*1000); // threshold in mV
while (thrrec.threshold <= thresholdUp*1000) {
SetDac(0, thrrec.threshold/1000.0);
SetCtrlVal(p1h, P1_STHRLOW, thrrec.threshold/1000.0);
//wait_loop(100000);
SetDac(ASD8, thrrec.threshold/1000.0);
SetCtrlVal(p1h, P1_SASD8THR, thrrec.threshold/1000.0);
status = fwrite(&thrrec, 1, thrrec.len, fp);
if (print) printf("THRREC status %d len %d threshold %d\n", status, thrrec.len, thrrec.threshold);
459,7 → 492,12
if (!daq_on) break;
thrrec.threshold += thresholdStep*1000;
} // threhsold loop
if (!daq_on) break;
biasrec.bias += runrec.biasStep;
} // bias loop
SetDac(SIPM, 0); // safety
//if (dsave) {
time (&endrec.time);
status = fwrite (&endrec, 1, endrec.len, fp);
547,6 → 585,7
QueueUserEvent (1000, p1h, P1_RESET);
//QueueUserEvent (1000, p1h, P1_ASD8THR);
QueueUserEvent (1000, p1h, P1_AMPDISSHTHR);
QueueUserEvent (1000, p1h, P1_BIAS);
do {
GetUserEvent (1, &pID, &rID);
switch (rID) {
650,19 → 689,27
SetCtrlAttribute (p1h, P1_ADC, ATTR_YMAP_MODE, status);
update_plots();
break;
/*case P1_ASD8THR:
case P1_ASD8THR:
{
double value;
GetCtrlVal (p1h, P1_SASD8THR, &value);
SetDac(0, value);
SetDac(ASD8, value);
}
break;*/
break;
case P1_BIAS:
{
double value;
GetCtrlVal (p1h, P1_SBIAS, &value);
value -= POWERSUPPLY;
SetDac(SIPM, value);
}
break;
case P1_AMPDISSHTHR:
{
double value;
GetCtrlVal (p1h, P1_SAMPDISSHTHR, &value);
SetDac(1, value);
SetDac(AMPDISSH, value);
 
}
break;
/sipmScan/src/analysisScan.cpp
496,7 → 496,7
int position(int x, int y, int channel)
{
int flag = 0;
if ( (x > (padCenter[channel][0] - 5000)) && (x < (padCenter[channel][0] + 5000)) &&
(y > (padCenter[channel][1] - 5000)) && (y < (padCenter[channel][1] + 5000)) ) flag = 1;
if ( (x > (padCenter[channel][0] - 5040)) && (x < (padCenter[channel][0] + 5040)) &&
(y > (padCenter[channel][1] - 5040)) && (y < (padCenter[channel][1] + 5040)) ) flag = 1;
return flag;
}
/sipmScan/examples/plotThresholdScan.C
11,7 → 11,7
#include "TSpectrum.h"
#include "stdio.h"
 
#include "RTUtil.h"
#include "include/RTUtil.h"
 
double getNoise(TH2F*, int, int);