29,7 → 29,7 |
// cTemp = new char[1024]; |
// sprintf(cTemp, "%s/results", rootdir); |
// file_info.fIniDir = StrDup(cTemp); |
file_info.fIniDir = StrDup(currentOpenDir); |
file_info.fIniDir = StrDup(currentAnalDir); |
file_info.fMultipleSelection = kFALSE; |
new TGFileDialog(gClient->GetDefaultRoot(), fMain, kFDOpen, &file_info); |
// delete[] cTemp; |
58,7 → 58,7 |
} |
else if(analTab->GetCurrent() == 1) // Relative PDE |
{ |
relPde->widgetChBox[1]->SetState(kButtonDown); |
relPde->widgetChBox[0]->SetState(kButtonDown); |
midPeak->widgetChBox[0]->SetState(kButtonUp); |
zeroAngle->widgetNE[0]->SetNumber(0.00); |
} |
370,6 → 370,7 |
double range[4]; |
TGraph2D *gScan2D; |
gScan2D = new TGraph2D(); |
gScan2D->SetName("edgescan"); |
range[0] = TMath::MinElement(nrfiles, surfxy); |
range[1] = TMath::MaxElement(nrfiles, surfxy); |
range[2] = TMath::MinElement(nrfiles, surfz); |
896,7 → 897,7 |
if(j > 50) break; |
} |
|
if(npeaks > 1) |
if( (npeaks > 1) && (nrfit > 1) ) |
{ |
int bin = histtemp->GetXaxis()->FindBin((int)(meanparam+meansel[sortindex[1]])/2); |
adcpedestal[0] = (meanparam+meansel[sortindex[1]])/2; |
993,7 → 994,14 |
if( (angle[i] == zeroAngle->widgetNE[0]->GetNumber()) && (darkhist != i) ) |
zeromu = i; |
|
muval[i] = -TMath::Log((double)k2/(double)k); |
// Checking for errors when fitting a histogram |
if(k2 == 0) |
{ |
printf("PhotonMu(): No pedestal entries found. Check the fitting results.\n"); |
muval[i] = -1; |
} |
else |
muval[i] = -TMath::Log((double)k2/(double)k); |
printf("PhotonMu(): %lf: muval = %lf\n", angle[i], muval[i]); |
|
inroot->Close(); |
1040,6 → 1048,10 |
if(i == darkhist) |
exclude = false; |
|
// Wrong fit |
if(muval[i] == -1) |
exclude = true; |
|
// If nothing excluded, pass the points in pointest variable like in a FIFO |
if(!exclude) |
{ |
1740,6 → 1752,7 |
double range[4]; |
TGraph2D *gScan2D; |
gScan2D = new TGraph2D(); |
gScan2D->SetName("surfscan"); |
range[0] = TMath::MinElement(nrfiles, surfx); |
range[1] = TMath::MaxElement(nrfiles, surfx); |
range[2] = TMath::MinElement(nrfiles, surfy); |
1842,6 → 1855,8 |
{ |
gCanvas->Modified(); |
gCanvas->Update(); |
|
UpdateIntegrateSurface(-1); |
} |
} |
} |