Added frame number check, and a check that the fit range exists.
Results improve.
This commit is contained in:
@ -230,7 +230,7 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
int nsteps = 0;
|
||||
if (module_str == "094" || module_str == "066") {
|
||||
nsteps = 80;
|
||||
nsteps = 79;
|
||||
} else {
|
||||
nsteps = 40;
|
||||
}
|
||||
@ -258,7 +258,32 @@ int main(int argc, char* argv[]) {
|
||||
avg_adcer_g1_map[j] = new TH2F(savename,"",NC,-0.5,NC-0.5,NR,-0.5,NR-0.5);
|
||||
}
|
||||
|
||||
int nfiles = nsteps/10;
|
||||
int nfiles = ceil(nsteps/10.);
|
||||
|
||||
// total frame number check
|
||||
int totalFrames = 0;
|
||||
|
||||
for (int filei = 0; filei < nfiles; filei++) {
|
||||
|
||||
sprintf(savename,"%s/%s_%%6.6d.dat", data_loc.c_str(), data_file.c_str());
|
||||
thisfile->open((char*)savename, filei);
|
||||
|
||||
while(thisfile->readNextFrame()) {
|
||||
totalFrames++;
|
||||
}
|
||||
|
||||
thisfile->close();
|
||||
}
|
||||
|
||||
if (totalFrames == nsteps*1000) {
|
||||
cout << "expected number of frames " << totalFrames << endl;
|
||||
} else {
|
||||
cout << "unexpected number of frames " << totalFrames << endl;
|
||||
cout << "code expected nsteps*1000 = " << nsteps*1000 << " frames" << endl;
|
||||
cout << "exiting to make sure you notice" << endl;
|
||||
exit(1);
|
||||
}
|
||||
|
||||
int framecounter = 0;
|
||||
for (int filei = 0; filei < nfiles; filei++) {
|
||||
|
||||
@ -402,10 +427,11 @@ int main(int argc, char* argv[]) {
|
||||
vector<double> r1_filterer;
|
||||
|
||||
for (int j = 0; j < nsteps; j++) {
|
||||
|
||||
int current = 0;
|
||||
if (nsteps == 40) {
|
||||
current = (j+1)*2;
|
||||
} else if (nsteps == 80) {
|
||||
} else if (nsteps == 79) {
|
||||
current = j+2;
|
||||
}
|
||||
|
||||
@ -431,24 +457,23 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
if (r0_adc.size() > 1 && r1_adc.size() > 1) {
|
||||
|
||||
TGraphErrors *grap_g0 = new TGraphErrors(r0_adc.size(),&(r0_filter[0]),&(r0_adc[0]),&(r0_filterer[0]),&(r0_adcer[0]));
|
||||
TGraphErrors *grap_g1 = new TGraphErrors(r1_adc.size(),&(r1_filter[0]),&(r1_adc[0]),&(r1_filterer[0]),&(r1_adcer[0]));
|
||||
|
||||
double rangemin0 = 0;
|
||||
if (module_str == "028" || module_str == "021" || module_str == "022" || module_str == "008" || module_str == "044" || module_str == "066" || module_str == "094") {
|
||||
rangemin0 = 2;
|
||||
} else if (module_str == "006") {
|
||||
rangemin0 = 4;
|
||||
}
|
||||
|
||||
double rangemin0 = *min_element(r0_filter.begin(),r0_filter.end());
|
||||
double rangemax0 = highestPointBeforeSwitching(r0_filter,r1_filter);
|
||||
range0maxhist->Fill(rangemax0);
|
||||
range0maxmap->Fill(i%NC,i/NC,rangemax0);
|
||||
|
||||
double rangemin1 = lowestPointAfterSwitching(r1_filter,r0_filter);
|
||||
range1minhist->Fill(rangemin1);
|
||||
range1minmap->Fill(i%NC,i/NC,rangemin1);
|
||||
double rangemax1 = *max_element(r1_filter.begin(),r1_filter.end());
|
||||
|
||||
if (rangemax0 > rangemin0 && rangemax1 > rangemin1) {
|
||||
|
||||
TGraphErrors *grap_g0 = new TGraphErrors(r0_adc.size(),&(r0_filter[0]),&(r0_adc[0]),&(r0_filterer[0]),&(r0_adcer[0]));
|
||||
TGraphErrors *grap_g1 = new TGraphErrors(r1_adc.size(),&(r1_filter[0]),&(r1_adc[0]),&(r1_filterer[0]),&(r1_adcer[0]));
|
||||
|
||||
TF1 *fit1 = new TF1("fit1","[0]+[1]*x",rangemin0,rangemax0);
|
||||
TF1 *fit2 = 0;
|
||||
TF1 *fit1_e = 0;
|
||||
TF1 *fit2_e = 0;
|
||||
|
||||
fit1->SetParameter(0, 100.);
|
||||
fit1->SetParameter(1, 1);
|
||||
@ -460,17 +485,6 @@ int main(int argc, char* argv[]) {
|
||||
g0map->Fill(i%NC,i/NC,fit1->GetParameter(1));
|
||||
g0ermap->Fill(i%NC,i/NC,fit1->GetParError(1));
|
||||
|
||||
fit1_e = new TF1("fit1_e","[0]+[1]*x",0,40);
|
||||
fit1_e->SetParameters(fit1->GetParameter(0),fit1->GetParameter(1));
|
||||
fit1_e->SetLineColor(kBlue);
|
||||
fit1_e->SetLineStyle(2);
|
||||
|
||||
double rangemin1 = lowestPointAfterSwitching(r1_filter,r0_filter);
|
||||
range1minhist->Fill(rangemin1);
|
||||
range1minmap->Fill(i%NC,i/NC,rangemin1);
|
||||
|
||||
double rangemax1 = 80;
|
||||
|
||||
fit2 = new TF1("fit2","[0]+[1]*x",rangemin1,rangemax1);
|
||||
|
||||
fit2->SetParameter(0, 1000.);
|
||||
@ -483,11 +497,6 @@ int main(int argc, char* argv[]) {
|
||||
g1map->Fill(i%NC,i/NC,fit2->GetParameter(1));
|
||||
g1ermap->Fill(i%NC,i/NC,fit2->GetParError(1));
|
||||
|
||||
fit2_e = new TF1("fit2_e","[0]+[1]*x",0,80);
|
||||
fit2_e->SetParameters(fit2->GetParameter(0),fit2->GetParameter(1));
|
||||
fit2_e->SetLineColor(kGreen+2);
|
||||
fit2_e->SetLineStyle(2);
|
||||
|
||||
g0overg1map->Fill(i%NC,i/NC,fit1->GetParameter(1)/fit2->GetParameter(1));
|
||||
g0overg1hist->Fill(fit1->GetParameter(1)/fit2->GetParameter(1));
|
||||
g0overg1ermap->Fill(i%NC,i/NC,abs(fit1->GetParameter(1)/fit2->GetParameter(1))*sqrt(pow((fit1->GetParError(1)/fit1->GetParameter(1)),2) + pow((fit2->GetParError(1)/fit2->GetParameter(1)),2)));
|
||||
@ -554,9 +563,7 @@ int main(int argc, char* argv[]) {
|
||||
grap_g1->Draw("AP");
|
||||
grap_g0->Draw("P");
|
||||
fit1->Draw("same");
|
||||
fit1_e->Draw("same");
|
||||
fit2->Draw("same");
|
||||
fit2_e->Draw("same");
|
||||
mapcanvas->Update();
|
||||
|
||||
TPaveStats *st0 = (TPaveStats*)grap_g0->FindObject("stats");
|
||||
@ -676,13 +683,12 @@ int main(int argc, char* argv[]) {
|
||||
}
|
||||
|
||||
delete fit1;
|
||||
delete fit1_e;
|
||||
delete fit2;
|
||||
delete fit2_e;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
range1minhist->GetXaxis()->SetTitle("Start of gain 1 fit [ADU]");
|
||||
range1minhist->Draw();
|
||||
|
Reference in New Issue
Block a user