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

Removed the pixel masks. no_calib are now accurate, and things aren't hidden.

Browse Source
This commit is contained in:
redford_s
2019-02-25 10:48:57 +01:00
parent 630559cdfe
commit 9bf8924dc8
1 changed files with 602 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
CS_analysis.cpp
View File

@ -218,50 +218,6 @@ int main(int argc, char* argv[]) {
// calculate pixel mask
pixelMaskObject->initialisePixelMask(pixel_mask);
if (module_str == "032") {
pixelMaskObject->maskChip(2,pixel_mask);
pixelMaskObject->maskChip(3,pixel_mask);
pixelMaskObject->maskChip(4,pixel_mask);
} else if (module_str == "002" || module_str == "003") {
pixelMaskObject->maskChip(3, 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->maskSupercolumn(2, 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 == "209") {
pixelMaskObject->maskChip(8,pixel_mask);
} else if (module_str == "223") {
pixelMaskObject->maskChip(2,pixel_mask);
} else if (module_str == "233") {
pixelMaskObject->maskChip(7,pixel_mask);
}
for (int i = 0; i < 640; i++) {
thisfile->readNextFrame();
@ -500,18 +456,15 @@ int main(int argc, char* argv[]) {
for (int i = 0; i < NCH; i++) {
if ((j-1) < 10 || (j > 8075 && j < 8085)) {
if (pixel_mask[i] == true) {
uint16_t adc = imagedptr[i]&0x3fff;
uint16_t gain = (imagedptr[i]&0xc000) >> 14;
adcmap_all->Fill(i%NC,i/NC,adc);
gainmap_all->Fill(i%NC,i/NC,gain);
}
}
if (((i/NC <= 255) && (i%64 == (j-1)%64)) ||
((i/NC >= 256) &&((-1*(i-524287))%64 == (j-1)%64))) {
if (pixel_mask[i] == true) {
uint16_t adc = imagedptr[i]&0x3fff;
uint16_t gain = (imagedptr[i]&0xc000) >> 14;
@ -534,7 +487,6 @@ int main(int argc, char* argv[]) {
}
}
}
if (createPerStepHistos && ((j-1) < 10 || (j > 8075 && j < 8085))) {
mapcanvas->cd();
adcmap_sel->GetXaxis()->SetTitle("Column");
@ -586,7 +538,6 @@ int main(int argc, char* argv[]) {
}
for (int i = 0; i < NCH; i++) {
if (pixel_mask[i] == true) {
gainmap_avg->Fill(i%NC,i/NC,gain_histos[i]->GetMean());
adcmap_avg_g0[j/640-1]->Fill(i%NC,i/NC,adc_histos_g0[i]->GetMean());
@ -618,7 +569,6 @@ int main(int argc, char* argv[]) {
adc_histos_g1[i]->Reset();
adc_histos_g2[i]->Reset();
}
}
if (createPerStepHistos == 1) {
c1->cd();
@ -911,8 +861,6 @@ int main(int argc, char* argv[]) {
for (int i = 0; i < NCH; i++) {
if (pixel_mask[i] == true) {
vector<double> r0_adc;
vector<double> r0_filter;
vector<double> r0_adcerr;
@ -1470,8 +1418,6 @@ int main(int argc, char* argv[]) {
delete grap_g0;
delete grap_g1;
delete grap_g2;
}
}
mapcanvas->SetLeftMargin(0.1);