Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
imagej-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
imagej-elphel
Commits
9739c913
Commit
9739c913
authored
Nov 25, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more fixing num stations mismatch
parent
defffe43
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
Distortions.java
src/main/java/Distortions.java
+4
-3
No files found.
src/main/java/Distortions.java
View file @
9739c913
...
@@ -13836,15 +13836,16 @@ Which parameters affect which matrices
...
@@ -13836,15 +13836,16 @@ Which parameters affect which matrices
int index=u1+v1*this.gridGeometry[0].length;
int index=u1+v1*this.gridGeometry[0].length;
if (getNumStations()<=station) updateNumStations(station+1);
if (getNumStations()<=station) updateNumStations(station+1);
int nView=this.viewMap[channel];
int nView=this.viewMap[channel];
if (nView>=this.photometricByView[station].length){ // OOB 1// NUll pointer - need to run F-field first?
int useStation=(this.stationZCorr!=null)?((this.stationZCorr[v1][u1].length>station)?station:(this.stationZCorr[v1][u1].length-1)):0;
if (nView>=this.photometricByView[station].length){ // OOB 1// NUll pointer - need to run F-field first? (oob1 when grid had less than now
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][2]+((
this.stationZCorr!=null
)?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],
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment