detectors/JFCalibration
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed default pixel masks.

Browse Source 
Now the pixel mask refers only to the pedestal data. There's an independent check of whether the calibration worked.
This commit is contained in:
redford_s
2019-04-15 18:01:01 +02:00
parent 3b0059ba79
commit b0f4a3095c
1 changed files with 20 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
CuFluo_analysis.cpp
View File

@ -81,45 +81,6 @@ int main(int argc, char* argv[]) {
// calculate pixel mask // calculate pixel mask
pixelMaskObject->initialisePixelMask(pixel_mask); pixelMaskObject->initialisePixelMask(pixel_mask);
if (module_str == "004") {
pixelMaskObject->maskChip(2, pixel_mask);
pixelMaskObject->maskSupercolumn(3,2, pixel_mask);
} else if (module_str == "006") {
pixelMaskObject->maskChip(6, pixel_mask);
pixelMaskObject->maskSupercolumn(4,1, pixel_mask);
pixelMaskObject->maskSupercolumn(4,2, pixel_mask);
} else if (module_str == "029") {
pixelMaskObject->maskChip(2, pixel_mask);
} else if (module_str == "035") {
pixelMaskObject->maskChip(2, pixel_mask);
} else if (module_str == "039") {
pixelMaskObject->maskChip(7, pixel_mask);
} else if (module_str == "040") {
pixelMaskObject->maskSupercolumn(4,2, pixel_mask);
} else if (module_str == "064") {
pixelMaskObject->maskSupercolumn(3,4,pixel_mask);
} else if (module_str == "065") {
pixelMaskObject->maskChip(5, pixel_mask);
} else if (module_str == "067") {
pixelMaskObject->maskChip(1,pixel_mask);
pixelMaskObject->maskChip(2,pixel_mask);
pixelMaskObject->maskChip(3,pixel_mask);
pixelMaskObject->maskChip(4,pixel_mask);
} else if (module_str == "086") {
pixelMaskObject->maskChip(8,pixel_mask);
} else if (module_str == "094") {
pixelMaskObject->maskChip(6,pixel_mask);
} else if (module_str == "121") {
pixelMaskObject->maskChip(1, pixel_mask);
} else if (module_str == "124") {
pixelMaskObject->maskChip(1, pixel_mask);
} else if (module_str == "125") {
pixelMaskObject->maskChip(7,pixel_mask);
} else if (module_str == "223") {
pixelMaskObject->maskChip(2,pixel_mask);
} else if (module_str == "233") {
pixelMaskObject->maskChip(7,pixel_mask);
}
int nevents = 0; int nevents = 0;
while (thisfile->readNextFrame()) { while (thisfile->readNextFrame()) {
@ -279,32 +240,30 @@ int main(int argc, char* argv[]) {
pedestalObject->addG0FrameToPedestalCalculationWThreshold(imagedptr, pedestalObject, pedeRMS16_G0); pedestalObject->addG0FrameToPedestalCalculationWThreshold(imagedptr, pedestalObject, pedeRMS16_G0);
for (int i = 0; i < NCH; i++) { for (int i = 0; i < NCH; i++) {
if (pixel_mask[i] == true) {
uint16_t gain = (imagedptr[i]&0xc000) >> 14; uint16_t gain = (imagedptr[i]&0xc000) >> 14;
if (gain == 0) { if (gain == 0) {
int adcpc = (imagedptr[i]&0x3fff) - pedestalObject->pedestalOfChannel(i); int adcpc = (imagedptr[i]&0x3fff) - pedestalObject->pedestalOfChannel(i);
adcpc_spec->Fill(adcpc); adcpc_spec->Fill(adcpc);
if (i < (65536*1)) { if (i < (65536*1)) {
adc2d_1->Fill(adcpc,i); adc2d_1->Fill(adcpc,i);
} else if (i < (65536*2)) { } else if (i < (65536*2)) {
adc2d_2->Fill(adcpc,i); adc2d_2->Fill(adcpc,i);
} else if (i < (65536*3)) { } else if (i < (65536*3)) {
adc2d_3->Fill(adcpc,i); adc2d_3->Fill(adcpc,i);
} else if (i < (65536*4)) { } else if (i < (65536*4)) {
adc2d_4->Fill(adcpc,i); adc2d_4->Fill(adcpc,i);
} else if (i < (65536*5)) { } else if (i < (65536*5)) {
adc2d_5->Fill(adcpc,i); adc2d_5->Fill(adcpc,i);
} else if (i < (65536*6)) { } else if (i < (65536*6)) {
adc2d_6->Fill(adcpc,i); adc2d_6->Fill(adcpc,i);
} else if (i < (65536*7)) { } else if (i < (65536*7)) {
adc2d_7->Fill(adcpc,i); adc2d_7->Fill(adcpc,i);
} else if (i < (65536*8)) { } else if (i < (65536*8)) {
adc2d_8->Fill(adcpc,i); adc2d_8->Fill(adcpc,i);
}
} }
} }
} }