Skip to content

I
imagej-elphel
Commit defffe43 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

Fixed reduced stations number mismatch in getXYZMPE()

parent c3d9692d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/main/java/Distortions.java
View file @ defffe43
...@@ -13839,10 +13839,12 @@ Which parameters affect which matrices ...@@ -13839,10 +13839,12 @@ Which parameters affect which matrices
if (nView>=this.photometricByView[station].length){ // OOB 1// NUll pointer - need to run F-field first? if (nView>=this.photometricByView[station].length){ // OOB 1// NUll pointer - need to run F-field first?
nView=this.photometricByView.length-1; nView=this.photometricByView.length-1;
} }
int useStation=(this.stationZCorr!=null)?((this.stationZCorr[v1][u1].length>station)?station:(this.stationZCorr[v1][u1].length-1)):-1;
double [] result= { // null double [] result= { // null
this.gridGeometry[v1][u1][0], this.gridGeometry[v1][u1][0],
this.gridGeometry[v1][u1][1], this.gridGeometry[v1][u1][1],
this.gridGeometry[v1][u1][2]+((this.stationZCorr!=null)?this.stationZCorr[v1][u1][station]:0.0), // per-station correction // this.gridGeometry[v1][u1][2]+((this.stationZCorr!=null)?this.stationZCorr[v1][u1][station]:0.0), // per-station correction
this.gridGeometry[v1][u1][2]+((useStation>=0)?this.stationZCorr[v1][u1][useStation]:0.0), // per-station correction
this.gridGeometry[v1][u1][3], this.gridGeometry[v1][u1][3],
this.photometricByView[station][nView][0][index], this.photometricByView[station][nView][0][index],
this.photometricByView[station][nView][1][index], this.photometricByView[station][nView][1][index],
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment