Skip to content

I
imagej-elphel
Commit ff8926d2 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files
Options

changes for merge

parents 5cfc5157 54790acc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 18161 additions and 10370 deletions
focusing_data_files/et65.dcal-xml 0 → 100644
View file @ ff8926d2
<?xml version="1.0" encoding="UTF-8"?><distortionCalibrationParameters>
<subcameras>2</subcameras>
<file>
<setNumber>0</setNumber>
<name>/home/focusing/extra_sensor/grd03/grid-1433525916_005705-00.tiff</name>
<enabled>true</enabled>
<hintedMatch>-1</hintedMatch>
<timestamp>1433525916.005705</timestamp>
<channel>0</channel>
<stationNumber>0</stationNumber>
<noUsefulPSFKernels>false</noUsefulPSFKernels>
<gridShiftX>0</gridShiftX>
<gridShiftY>0</gridShiftY>
<gridRotate>0</gridRotate>
<subcamAzimuth>-89.5232635733637</subcamAzimuth>
<subcamDistance>15.421</subcamDistance>
<subcamHeight>106.657</subcamHeight>
<subcamHeading>90.47926190822426</subcamHeading>
<subcamElevation>0.10330502935616417</subcamElevation>
<subcamRoll>-0.01954340839978287</subcamRoll>
<goniometerHorizontal>0.0</goniometerHorizontal>
<goniometerAxial>0.0</goniometerAxial>
<interAxisDistance>0.0</interAxisDistance>
<interAxisAngle>0.0</interAxisAngle>
<horAxisErrPhi>0.0</horAxisErrPhi>
<horAxisErrPsi>-0.4842269080850404</horAxisErrPsi>
<entrancePupilForward>0.0</entrancePupilForward>
<centerAboveHorizontal>0.0</centerAboveHorizontal>
<GXYZ0>-288.46435181218317</GXYZ0>
<GXYZ1>123.01545753798013</GXYZ1>
<GXYZ2>3062.6797512755415</GXYZ2>
<subcamFocalLength>4.350524252544088</subcamFocalLength>
<subcamPX0>1498.345754366777</subcamPX0>
<subcamPY0>996.7430113773923</subcamPY0>
<subcamDistortionA8>0.0</subcamDistortionA8>
<subcamDistortionA7>0.0</subcamDistortionA7>
<subcamDistortionA6>0.0</subcamDistortionA6>
<subcamDistortionA5>0.0</subcamDistortionA5>
<subcamDistortionA>0.0</subcamDistortionA>
<subcamDistortionB>0.0</subcamDistortionB>
<subcamDistortionC>0.0</subcamDistortionC>
<subcamElong_C_o>0.0</subcamElong_C_o>
<subcamElong_C_d>0.0</subcamElong_C_d>
<subcamEccen_B_x>0.0</subcamEccen_B_x>
<subcamEccen_B_y>0.0</subcamEccen_B_y>
<subcamElong_B_o>0.0</subcamElong_B_o>
<subcamElong_B_d>0.0</subcamElong_B_d>
<subcamEccen_A_x>0.0</subcamEccen_A_x>
<subcamEccen_A_y>0.0</subcamEccen_A_y>
<subcamElong_A_o>0.0</subcamElong_A_o>
<subcamElong_A_d>0.0</subcamElong_A_d>
<subcamEccen_A5_x>0.0</subcamEccen_A5_x>
<subcamEccen_A5_y>0.0</subcamEccen_A5_y>
<subcamElong_A5_o>0.0</subcamElong_A5_o>
<subcamElong_A5_d>0.0</subcamElong_A5_d>
<subcamEccen_A6_x>0.0</subcamEccen_A6_x>
<subcamEccen_A6_y>0.0</subcamEccen_A6_y>
<subcamElong_A6_o>0.0</subcamElong_A6_o>
<subcamElong_A6_d>0.0</subcamElong_A6_d>
<subcamEccen_A7_x>0.0</subcamEccen_A7_x>
<subcamEccen_A7_y>0.0</subcamEccen_A7_y>
<subcamElong_A7_o>0.0</subcamElong_A7_o>
<subcamElong_A7_d>0.0</subcamElong_A7_d>
<subcamEccen_A8_x>0.0</subcamEccen_A8_x>
<subcamEccen_A8_y>0.0</subcamEccen_A8_y>
<subcamElong_A8_o>0.0</subcamElong_A8_o>
<subcamElong_A8_d>0.0</subcamElong_A8_d>
</file>
<file>
<setNumber>0</setNumber>
<name>/home/focusing/extra_sensor/grd03/grid-1433525916_005705-01.tiff</name>
<enabled>true</enabled>
<hintedMatch>-1</hintedMatch>
<timestamp>1433525916.005705</timestamp>
<channel>1</channel>
<stationNumber>0</stationNumber>
<noUsefulPSFKernels>false</noUsefulPSFKernels>
<gridShiftX>0</gridShiftX>
<gridShiftY>0</gridShiftY>
<gridRotate>0</gridRotate>
<subcamAzimuth>87.32218955968492</subcamAzimuth>
<subcamDistance>121.53387881027079</subcamDistance>
<subcamHeight>175.28880671684135</subcamHeight>
<subcamHeading>-87.28338902220055</subcamHeading>
<subcamElevation>0.0</subcamElevation>
<subcamRoll>181.24500390136868</subcamRoll>
<goniometerHorizontal>0.0</goniometerHorizontal>
<goniometerAxial>0.0</goniometerAxial>
<interAxisDistance>0.0</interAxisDistance>
<interAxisAngle>0.0</interAxisAngle>
<horAxisErrPhi>0.0</horAxisErrPhi>
<horAxisErrPsi>-0.4842269080850404</horAxisErrPsi>
<entrancePupilForward>0.0</entrancePupilForward>
<centerAboveHorizontal>0.0</centerAboveHorizontal>
<GXYZ0>-288.46435181218317</GXYZ0>
<GXYZ1>123.01545753798013</GXYZ1>
<GXYZ2>3062.6797512755415</GXYZ2>
<subcamFocalLength>4.392312180104789</subcamFocalLength>
<subcamPX0>1298.259243134638</subcamPX0>
<subcamPY0>944.3103956220813</subcamPY0>
<subcamDistortionA8>0.0</subcamDistortionA8>
<subcamDistortionA7>0.0</subcamDistortionA7>
<subcamDistortionA6>0.04651990192776346</subcamDistortionA6>
<subcamDistortionA5>-0.11033762906831542</subcamDistortionA5>
<subcamDistortionA>0.1552183635361213</subcamDistortionA>
<subcamDistortionB>-0.13635431484984734</subcamDistortionB>
<subcamDistortionC>0.01306922981029024</subcamDistortionC>
<subcamElong_C_o>0.0010983286930489984</subcamElong_C_o>
<subcamElong_C_d>-1.796289984712268E-4</subcamElong_C_d>
<subcamEccen_B_x>0.0018925896569627245</subcamEccen_B_x>
<subcamEccen_B_y>0.003077414145183385</subcamEccen_B_y>
<subcamElong_B_o>-0.002239391059567211</subcamElong_B_o>
<subcamElong_B_d>5.759374684091282E-4</subcamElong_B_d>
<subcamEccen_A_x>-9.352839401542586E-4</subcamEccen_A_x>
<subcamEccen_A_y>-7.957059709993681E-4</subcamEccen_A_y>
<subcamElong_A_o>0.0011275653540290913</subcamElong_A_o>
<subcamElong_A_d>-3.6430545534364293E-4</subcamElong_A_d>
<subcamEccen_A5_x>0.0</subcamEccen_A5_x>
<subcamEccen_A5_y>0.0</subcamEccen_A5_y>
<subcamElong_A5_o>0.0</subcamElong_A5_o>
<subcamElong_A5_d>0.0</subcamElong_A5_d>
<subcamEccen_A6_x>0.0</subcamEccen_A6_x>
<subcamEccen_A6_y>0.0</subcamEccen_A6_y>
<subcamElong_A6_o>0.0</subcamElong_A6_o>
<subcamElong_A6_d>0.0</subcamElong_A6_d>
<subcamEccen_A7_x>0.0</subcamEccen_A7_x>
<subcamEccen_A7_y>0.0</subcamEccen_A7_y>
<subcamElong_A7_o>0.0</subcamElong_A7_o>
<subcamElong_A7_d>0.0</subcamElong_A7_d>
<subcamEccen_A8_x>0.0</subcamEccen_A8_x>
<subcamEccen_A8_y>0.0</subcamEccen_A8_y>
<subcamElong_A8_o>0.0</subcamElong_A8_o>
<subcamElong_A8_d>0.0</subcamElong_A8_d>
</file>
<set>
<index>0</index>
<stationNumber>0</stationNumber>
<timestamp>1433525916.005705</timestamp>
<orientationEstimated>false</orientationEstimated>
<goniometerHorizontal>0.0</goniometerHorizontal>
<goniometerAxial>0.0</goniometerAxial>
<interAxisDistance>0.0</interAxisDistance>
<interAxisAngle>0.0</interAxisAngle>
<horAxisErrPhi>0.0</horAxisErrPhi>
<horAxisErrPsi>-0.4842269080850404</horAxisErrPsi>
<entrancePupilForward>0.0</entrancePupilForward>
<centerAboveHorizontal>0.0</centerAboveHorizontal>
<GXYZ0>-288.46435181218317</GXYZ0>
<GXYZ1>123.01545753798013</GXYZ1>
<GXYZ2>3062.6797512755415</GXYZ2>
</set>
</distortionCalibrationParameters>
focusing_data_files/et71_fixaz0.stg-xml 0 → 100644
View file @ ff8926d2
This source diff could not be displayed because it is too large. You can view the blob instead.
focusing_data_files/et71_minimal.conf-xml 0 → 100644
View file @ ff8926d2
This diff is collapsed.
pom.xml
View file @ ff8926d2
......@@ -8,19 +8,19 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>1.135</version>
<relativePath />
</parent>
<!--
<version>3.1</version>
<relativePath/>
</parent>
<properties>
<imagej.app.directory>/data/ImageJ/ImageJ</imagej.app.directory>
<imagej.app.directory>/home/foxel/Desktop/Fiji.app</imagej.app.directory>
</properties>
-->
<groupId>com.elphel</groupId>
<artifactId>imagej-elphel</artifactId>
<!-- <artifactId>Aberration_Calibration</artifactId> -->
<version>1.0.0</version>
<version>1.0.0-SNAPSHOT</version>
<name>plugins/imagej_elphel.jar</name>
<!-- <name>plugins/Aberration_Calibration.jar</name> -->
......@@ -29,11 +29,11 @@
<dependencies>
<dependency>
<groupId>net.imagej</groupId>
<artifactId>ij</artifactId>
<version>1.50b</version>
<!-- <version>${imagej1.version}</version> -->
</dependency>
<groupId>net.imagej</groupId>
<artifactId>ij</artifactId>
<version>1.50b</version>
<!-- <version>${imagej1.version}</version> -->
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
......@@ -74,29 +74,31 @@
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
<executions>
<execution>
<id>mojo-descriptor</id>
<goals>
<goal>descriptor</goal>
</goals>
</execution>
</executions>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
<executions>
<execution>
<id>mojo-descriptor</id>
<goals>
<goal>descriptor</goal>
</goals>
</execution>
</executions>
</plugin>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>java</goal>
</goals>
......@@ -107,7 +109,28 @@
<mainClass>Eyesis_Correction</mainClass>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>true</doCheck>
<doUpdate>true</doUpdate>
<format>Build {0,date,yyyy-MM-dd} {0,time,HH:MM:SS} on host {1}</format>
<items>
<item>timestamp</item>
<item>foxel-MRHM7AP</item>
</items>
</configuration>
</plugin>
</plugins>
</build>
......@@ -146,10 +169,22 @@
<scm>
<connection>scm:git:git://github.com/Elphel/imagej-elphel</connection>
<developerConnection>sscm:git:https://github.com/Elphel/imagej-elphel</developerConnection>
<developerConnection>scm:git:https://github.com/Elphel/imagej-elphel</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/Elphel/imagej-elphel</url>
</scm>
<packaging>maven-plugin</packaging>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.14</version>
<configuration>
<configLocation>config/sun_checks.xml</configLocation>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
src/main/java/Aberration_Calibration.java
View file @ ff8926d2
This diff is collapsed.
src/main/java/CalibrationHardwareInterface.java
View file @ ff8926d2
......@@ -150,14 +150,19 @@ public class CalibrationHardwareInterface {
this.thisTime=this.startTime;
}
private int [][] channelMap26={ // ip index, channel number
{0,0},{1,0},{2,0},{3,0},{4,0},{5,0},{6,0},{7,0}, // modified!
{0,1},{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},
{0,2},{1,2},{2,2},{3,2},{4,2},{5,2},{6,2},{7,2},
{8,0},{8,1}};
private int [][] channelMap21={ // ip index, channel number
{0,1},{0,0},{0,2},
{1,1},{1,0},{1,2},
{2,1},{2,0},{2,2},
{3,1},{3,0},{3,2},
{4,1},{4,0},{4,2},
{5,1},{5,0},{5,2},
{6,1},{6,0},{6,2}};
private int [][] channelMap1={ // ip index, channel number
// {0,-1}}; // negative channel - single camera
{0,0}}; // Try with 0
private int [][] channelMap2={ // ip index, channel number
{0,0},{0,1}};
private int [][] channelMap3={ // ip index, channel number
// {0,-1}}; // negative channel - single camera
{0,0},{1,0},{2,0}};
......@@ -257,19 +262,25 @@ public class CalibrationHardwareInterface {
private void initDefaultMap(int size){
this.channelMap=new int [size][];
this.flipImages=new boolean[size];
if (size==1) {
if (size==1) { // single camera - old lens focusing
this.channelMap[0]=channelMap1[0].clone();
this.flipImages[0]=true;
} else if (size==2){ // New lens focusing machine
this.channelMap[0]=channelMap2[0].clone();
this.flipImages[0]=true; // main sensor under test
this.channelMap[1]=channelMap2[1].clone();
this.flipImages[1]=false; // extra sensor for location
} else if (size==3){
for (int i=0;i<size;i++){
this.flipImages[i]=false;
int i0=((i>=this.channelMap3.length)?(this.channelMap3.length-1):i);
this.channelMap[i]=this.channelMap26[i0].clone();
this.channelMap[i]=this.channelMap21[i0].clone();
}
} else for (int i=0;i<size;i++){
this.flipImages[i]=false;
int i0=((i>=this.channelMap26.length)?(this.channelMap26.length-1):i);
this.channelMap[i]=this.channelMap26[i0].clone();
int i0=((i>=this.channelMap21.length)?(this.channelMap21.length-1):i);
this.channelMap[i]=this.channelMap21[i0].clone();
}
}
public void setProperties(String prefix,Properties properties){
......@@ -1758,6 +1769,16 @@ public class CalibrationHardwareInterface {
this.lastTimestamp=(String) this.images[0].getProperty("timestamp");
return this.images[0];
}
public ImagePlus [] acquireSeveralImages (boolean useLasers, boolean updateStatus){
getImages(
null, // UVLEDLasers
selectAllSubcameras(),
(useLasers?selectAllSubcameras():null),
true,
this.debugLevel>1); // reset and trigger
this.lastTimestamp=(String) this.images[0].getProperty("timestamp");
return this.images;
}
public ImagePlus acquireSingleImage (UVLEDandLasers uvLEDLasers, boolean updateStatus){
getImages(
......@@ -1816,7 +1837,7 @@ public class CalibrationHardwareInterface {
public String [] groups={"heater","fan","light","light1","light2"};
public int debugLevel=1;
private String powerIP="192.168.0.80";
private double lightsDelay=5.0;
private double lightsDelay=1.0;
private final String urlFormat="http://%s/insteon/index.php?cmd=%s&group=%s&timestamp=%d";
private final String rootElement="Document";
public boolean powerConrtolEnabled=false;
......
src/main/java/DistortionCalibrationData.java 0 → 100644
View file @ ff8926d2
This diff is collapsed.
src/main/java/DistortionProcessConfiguration.java 0 → 100644
View file @ ff8926d2
This diff is collapsed.
src/main/java/Distortions.java
View file @ ff8926d2
This diff is collapsed.
src/main/java/EyesisAberrations.java
View file @ ff8926d2
This diff is collapsed.
src/main/java/EyesisCameraParameters.java 0 → 100644
View file @ ff8926d2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/java/EyesisSubCameraParameters.java 0 → 100644
View file @ ff8926d2
This diff is collapsed.
src/main/java/Eyesis_Correction.java
View file @ ff8926d2
......@@ -2516,7 +2516,7 @@ private Panel panel1,panel2,panel3,panel4,panel5,panel5a, panel6,panel7,panelPos
return false;
}
/* ======================================================================== */
private String [] selectSourceFiles(String [] defaultPaths) {
public String [] selectSourceFiles(String [] defaultPaths) {
String []patterns={".jp4",".jp46",".tiff",".tif"};
return selectFiles(false, // save
"Source file(s) selection", // title
......
src/main/java/FittingStrategy.java 0 → 100644
View file @ ff8926d2
This diff is collapsed.
src/main/java/FocusingField.java
View file @ ff8926d2
......@@ -8631,6 +8631,50 @@ public boolean LevenbergMarquardt(
return turnCW;
}
/**
* Post UV gluing fixture adjustment, screw numbers match motor numbers
* @param umPerTurn sensitivity of the 3 adjustment screws - microns of the uv-glued support movement per screw revolution
* @param zErr current focal distance error in microns, positive - away from lens
* @param tXErr current horizontal tilt in microns/mm , positive - 1,2 away from lens, 3 - to the lens
* @param tYErr current vertical tilt in microns/mm , positive - 2 away from lens, 1 - to the lens
* @return array of optimal CW rotations of each screw (1.0 == 360 deg)
* @return array of optimal CW rotations of each screw (1.0 == 360 deg)
*/
public double [] getManualScrews(
double [] umPerTurn, // if null - use defined here
double zErr, // positive - away from lens
double tXErr,// positive - 1,2 away from lens, 3 - to the lens
double tYErr){// positive - 2 away from lens
// double [][] screws={ // right, up, thread pitch (pull) !!! Inverting Y! - again invert? 1 - far left, 2 - near left, 3 - right
// { 13.5, -6.5, 192.8}, // -2.908571735}, // 192.8, ... for proto push-away fixture
// { 13.5, 6.5, 202.6}, // -3.8198374024},
// { -13.6, 3.5, 83.4}}; // -2.4491867448}};
double [][] screws={ // right, up, thread pitch (pull) 1 - far left, 2 - near left, 3 - right
{ -13.5, 6.5, -300.0}, //192.8}, // -2.908571735}, // 192.8, ... for proto push-away fixture
{ -13.5, -6.5, -300.0}, //202.6}, // -3.8198374024},
{ 13.6, -3.5, -120.0}}; //83.4}}; // -2.4491867448}};
if (umPerTurn!=null) for (int i=0;i<umPerTurn.length;i++) screws[i][2]=umPerTurn[i];
double [] moveDownUm=new double [screws.length];
double [] turnCW=new double [screws.length];
for (int i=0;i<screws.length;i++){
moveDownUm[i]=zErr + screws[i][0]*tXErr+screws[i][1]*tYErr;
turnCW[i]=moveDownUm[i]/screws[i][2];
}
return turnCW;
}
/*
*
192.8479341564
202.5779753086
83.4354504792
-2.908571735
-3.8198374024
-2.4491867448
*/
/**
* Calculate three linearized values of motor positions for current parameters, target center focal
* shift and tilt (from the optic axis)
......
src/main/java/Goniometer.java
View file @ ff8926d2
......@@ -47,16 +47,16 @@ horizontal axis:
public CalibrationHardwareInterface.CamerasInterface cameras = null;
// public CalibrationHardwareInterface.LaserPointers lasers = null;
// public static CalibrationHardwareInterface.FocusingMotors motorsS=null;
// public Distortions.DistortionProcessConfiguration
// public DistortionProcessConfiguration
// distortionProcessConfiguration=null;
// public LensAdjustment.FocusMeasurementParameters focusMeasurementParameters = null;
// public Distortions.PatternParameters patternParameters=null;
// public Distortions.LensDistortionParameters
// public PatternParameters patternParameters=null;
// public LensDistortionParameters
// lensDistortionParameters=null;
// public MatchSimulatedPattern.DistortionParameters distortion = null;
public MatchSimulatedPattern.DistortionParameters distortionParametersDefault=null;
public Distortions.EyesisCameraParameters eyesisCameraParameters = null;
public EyesisCameraParameters eyesisCameraParameters = null;
public MatchSimulatedPattern[] matchSimulatedPatterns = null; // =new
// MatchSimulatedPattern();
......@@ -64,7 +64,7 @@ horizontal axis:
MatchSimulatedPattern.PatternDetectParameters patternDetectParameters=null;
public SimulationPattern.SimulParameters simulParametersDefault=null;
public Goniometer.GoniometerParameters goniometerParameters = null;
public Distortions.DistortionProcessConfiguration distortionProcessConfiguration=null;
public DistortionProcessConfiguration distortionProcessConfiguration=null;
public int lastScanStep=-1;
public int debugLevel = 2;
public double bottomRollerTilt=60.0; // decrease scan step if tilt is above this
......@@ -75,11 +75,11 @@ horizontal axis:
MatchSimulatedPattern.DistortionParameters distortionParametersDefault,
// MatchSimulatedPattern.DistortionParameters distortion,
MatchSimulatedPattern.PatternDetectParameters patternDetectParameters,
Distortions.EyesisCameraParameters eyesisCameraParameters,
EyesisCameraParameters eyesisCameraParameters,
MatchSimulatedPattern.LaserPointer laserPointers,
SimulationPattern.SimulParameters simulParametersDefault,
Goniometer.GoniometerParameters goniometerParameters,
Distortions.DistortionProcessConfiguration distortionProcessConfiguration
DistortionProcessConfiguration distortionProcessConfiguration
) {
this.cameras = cameras;
this.distortionParametersDefault = distortionParametersDefault;
......@@ -519,8 +519,8 @@ horizontal axis:
public boolean testHintedTarget (
ImagePlus[] images,
Distortions lensDistortions, // should not be null
Distortions.DistortionCalibrationData distortionCalibrationData,
Distortions.PatternParameters patternParameters, // should not be null
DistortionCalibrationData distortionCalibrationData,
PatternParameters patternParameters, // should not be null
boolean equalizeGreens,
int threadsMax,
boolean updateStatus,
......@@ -598,6 +598,7 @@ horizontal axis:
subCam,
goniometerTiltAxial[0], // Tilt, goniometerHorizontal
goniometerTiltAxial[1], // Axial,goniometerAxial
goniometerTiltAxial[2], // inter-axis angle
-1, // use camera parameters, not imageSet
true // filter border
);
......@@ -677,7 +678,7 @@ horizontal axis:
*
* this.parameterMode[numSeries][i]=gd.getNextChoiceIndex();
Distortions.PatternParameters patternParameters, // should not be null
PatternParameters patternParameters, // should not be null
boolean equalizeGreens,
int threadsMax,
boolean updateStatus,
......@@ -724,8 +725,8 @@ horizontal axis:
// MatchSimulatedPattern.PatternDetectParameters patternDetectParameters,
// MatchSimulatedPattern.LaserPointer laserPointer, // null OK
// SimulationPattern.SimulParameters simulParametersDefault,
Distortions.DistortionCalibrationData distortionCalibrationData,
Distortions.PatternParameters patternParameters, // should not be null
DistortionCalibrationData distortionCalibrationData,
PatternParameters patternParameters, // should not be null
Distortions lensDistortions, // should not be null
boolean equalizeGreens,
int threadsMax,
......@@ -888,8 +889,8 @@ horizontal axis:
}
}
/*
* Distortions.DistortionCalibrationData distortionCalibrationData= new
* Distortions.DistortionCalibrationData( imp_calibrated, //ImagePlus []
* DistortionCalibrationData distortionCalibrationData= new
* DistortionCalibrationData( imp_calibrated, //ImagePlus []
* images, // images in the memory patternParameters,
* //PatternParameters patternParameters, eyesisCameraParameters
* //EyesisCameraParameters eyesisCameraParameters );
......@@ -914,7 +915,7 @@ horizontal axis:
// fitting strategy
// distortionCalibrationData.pathName=this.goniometerParameters.initialCalibrationFile;
lensDistortions.debugLevel = this.debugLevel;
lensDistortions.fittingStrategy = new Distortions.FittingStrategy(true,
lensDistortions.fittingStrategy = new FittingStrategy(true,
this.goniometerParameters.strategyFile,
distortionCalibrationData); // will use list of grid files
if (lensDistortions.fittingStrategy.pathName == null) { // failed to select/open the file
......
src/main/java/LensAdjustment.java
View file @ ff8926d2
This diff is collapsed.
src/main/java/LensDistortionParameters.java 0 → 100644
View file @ ff8926d2
This diff is collapsed.
src/main/java/MatchSimulatedPattern.java
View file @ ff8926d2
This diff is collapsed.
src/main/java/PatternParameters.java 0 → 100644
View file @ ff8926d2
This diff is collapsed.
src/main/java/PixelMapping.java
View file @ ff8926d2
This diff is collapsed.
src/main/java/SFEPhases.java
View file @ ff8926d2
......@@ -818,7 +818,7 @@ public class SFEPhases {
// Ask for image selection (multiple directories), accumulate and create array of accumulated images
public ImagePlus[] getInteractiveAccumulatedImages(
Distortions.DistortionProcessConfiguration distortionProcessConfiguration,
DistortionProcessConfiguration distortionProcessConfiguration,
final AtomicInteger stopRequested,
int threadsMax,
boolean updateStatus,
......@@ -1199,7 +1199,7 @@ public class SFEPhases {
}
public SensorDefects[] accummulateSensorDefects(
Distortions.DistortionProcessConfiguration distortionProcessConfiguration,
DistortionProcessConfiguration distortionProcessConfiguration,
int tileClearSize,
int tileMargins,
int cmask, // bitmask of color channels to process (9 - two greens)
......
src/main/java/WavePatternGenerator.java 0 → 100644
View file @ ff8926d2
This diff is collapsed.
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