Change options for ASTAP 0.9.106

pchev · Sep 18, 2018 · 9fa6b59 · 9fa6b59
1 parent decf310
commit 9fa6b59
Show file tree

Hide file tree

Showing 6 changed files with 143 additions and 176 deletions.
diff --git a/src/cu_astrometry.pas b/src/cu_astrometry.pas
@@ -174,8 +174,7 @@ function TAstrometry.StartAstrometry(infile,outfile: string; terminatecmd:TNotif
    engine.PlateSolveWait:=config.GetValue('/Astrometry/PlatesolveWait',0);
    engine.ASTAPFolder:=config.GetValue('/Astrometry/ASTAPFolder','');
    engine.ASTAPSearchRadius:=config.GetValue('/Astrometry/ASTAPSearchRadius',5);
-   engine.ASTAPStartMag:=config.GetValue('/Astrometry/ASTAPStartMag',10.0);
-   engine.ASTAPLimitMag:=config.GetValue('/Astrometry/ASTAPLimitMag',16.5);
+   engine.ASTAPdownsample:=config.GetValue('/Astrometry/ASTAPdownsample',1);
    engine.LogFile:=logfile;
    engine.InFile:=infile;
    engine.OutFile:=outfile;

diff --git a/src/cu_astrometry_engine.pas b/src/cu_astrometry_engine.pas
@@ -40,8 +40,7 @@ TAstrometry_engine = class(TThread)
      FObjs,FDown,FResolver,FPlateSolveWait,Fiwidth,Fiheight: integer;
      Fplot: boolean;
      Fresult:integer;
-     FASTAPStartMag,FASTAPLimitMag: double;
-     FASTAPSearchRadius: integer;
+     FASTAPSearchRadius,FASTAPdownsample: integer;
      Fcmd: string;
      FOtherOptions: string;
      FUseScript,FUseWSL: Boolean;
@@ -88,8 +87,7 @@ TAstrometry_engine = class(TThread)
      property PlateSolveWait:integer read FPlateSolveWait write FPlateSolveWait;
      property ASTAPFolder: string read FASTAPFolder write FASTAPFolder;
      property ASTAPSearchRadius: integer read FASTAPSearchRadius write FASTAPSearchRadius;
-     property ASTAPStartMag: double read FASTAPStartMag write FASTAPStartMag;
-     property ASTAPLimitMag: double read FASTAPLimitMag write FASTAPLimitMag;
+     property ASTAPdownsample: Integer read FASTAPdownsample write FASTAPdownsample;
 end;
 
 implementation
@@ -405,10 +403,8 @@ procedure TAstrometry_engine.Resolve;
   {$endif}
   Fparam.Add('-fov');
   Fparam.Add(FormatFloat(f2,max(FXsize,FYsize)));
-  Fparam.Add('-M');
-  Fparam.Add(FormatFloat(f2,FASTAPStartMag));
-  Fparam.Add('-m');
-  Fparam.Add(FormatFloat(f2,FASTAPLimitMag));
+  Fparam.Add('-z');
+  Fparam.Add(inttostr(FASTAPdownsample));
   Fparam.Add('-r');
   Fparam.Add(inttostr(FASTAPSearchRadius));
   Fparam.Add('-f');

diff --git a/src/pu_main.pas b/src/pu_main.pas
@@ -4418,8 +4418,7 @@ procedure Tf_main.MenuOptionsClick(Sender: TObject);
    f_option.PlatesolveWait.Value:=config.GetValue('/Astrometry/PlatesolveWait',0);
    f_option.ASTAPFolder.Text:=config.GetValue('/Astrometry/ASTAPFolder',{$ifdef mswindows}'C:\Program Files\astap'{$else}'/opt/astap'{$endif});
    f_option.ASTAPSearchRadius.Value:=config.GetValue('/Astrometry/ASTAPSearchRadius',5);
-   f_option.ASTAPStartMag.Value:=config.GetValue('/Astrometry/ASTAPStartMag',10.0);
-   f_option.ASTAPLimitMag.Value:=config.GetValue('/Astrometry/ASTAPLimitMag',16.5);
+   f_option.ASTAPdownsample.Value:=config.GetValue('/Astrometry/ASTAPdownsample',1);
    f_option.PrecSlewBox.ItemIndex:=config.GetValue('/PrecSlew/Method',0);
    f_option.SlewPrec.Value:=config.GetValue('/PrecSlew/Precision',5.0);
    f_option.SlewRetry.Value:=config.GetValue('/PrecSlew/Retry',3);
@@ -4583,8 +4582,7 @@ procedure Tf_main.MenuOptionsClick(Sender: TObject);
      config.SetValue('/Astrometry/PlatesolveWait',f_option.PlatesolveWait.Value);
      config.SetValue('/Astrometry/ASTAPFolder',f_option.ASTAPFolder.Text);
      config.SetValue('/Astrometry/ASTAPSearchRadius',f_option.ASTAPSearchRadius.Value);
-     config.SetValue('/Astrometry/ASTAPStartMag',f_option.ASTAPStartMag.Value);
-     config.SetValue('/Astrometry/ASTAPLimitMag',f_option.ASTAPLimitMag.Value);
+     config.SetValue('/Astrometry/ASTAPdownsample',f_option.ASTAPdownsample.Value);
      config.SetValue('/PrecSlew/Method',f_option.PrecSlewBox.ItemIndex);
      config.SetValue('/PrecSlew/Precision',f_option.SlewPrec.Value);
      config.SetValue('/PrecSlew/Retry',f_option.SlewRetry.Value);