Simplify filter or no filter preprocessing

Author: pchev

install.sh

@@ -45,16 +45,12 @@ install -v -m 755 scripts/astrometry-online.sh  $destdir/share/ccdciel/scripts/a
 install -v -m 755 scripts/astrometry-macos.sh  $destdir/share/ccdciel/scripts/astrometry-macos.sh
 install -v -m 755 scripts/siril_bias.script  $destdir/share/ccdciel/scripts/siril_bias.script
 install -v -m 755 scripts/siril_dark.script $destdir/share/ccdciel/scripts/siril_dark.script
-install -v -m 755 scripts/siril_flat_filter.script $destdir/share/ccdciel/scripts/siril_flat_filter.script
 install -v -m 755 scripts/siril_flat.script $destdir/share/ccdciel/scripts/siril_flat.script
-install -v -m 755 scripts/siril_light_filter.script $destdir/share/ccdciel/scripts/siril_light_filter.script
 install -v -m 755 scripts/siril_light.script $destdir/share/ccdciel/scripts/siril_light.script
 install -v -m 755 scripts/siril/template_bias.ssf  $destdir/share/ccdciel/scripts/siril/template_bias.ssf
 install -v -m 755 scripts/siril/template_dark.ssf  $destdir/share/ccdciel/scripts/siril/template_dark.ssf
 install -v -m 755 scripts/siril/template_flat.ssf  $destdir/share/ccdciel/scripts/siril/template_flat.ssf
 install -v -m 755 scripts/siril/template_light.ssf  $destdir/share/ccdciel/scripts/siril/template_light.ssf
-install -v -m 755 scripts/siril/template_flat_filter.ssf  $destdir/share/ccdciel/scripts/siril/template_flat_filter.ssf
-install -v -m 755 scripts/siril/template_light_filter.ssf  $destdir/share/ccdciel/scripts/siril/template_light_filter.ssf
 install -v -m 644 data/stars/focus_star_4  $destdir/share/ccdciel/data/stars/focus_star_4 
 install -v -m 644 data/stars/focus_star_5  $destdir/share/ccdciel/data/stars/focus_star_5 
 install -v -m 644 data/stars/focus_star_6  $destdir/share/ccdciel/data/stars/focus_star_6 

install_darwin.sh

@@ -40,16 +40,12 @@ install -v -m 755 scripts/astrometry-online.sh  $destdir/scripts/astrometry-onli
 install -v -m 755 scripts/astrometry-macos.sh  $destdir/scripts/astrometry-macos.sh
 install -v -m 755 scripts/siril_bias.script  $destdir/scripts/siril_bias.script
 install -v -m 755 scripts/siril_dark.script $destdir/scripts/siril_dark.script
-install -v -m 755 scripts/siril_flat_filter.script $destdir/scripts/siril_flat_filter.script
 install -v -m 755 scripts/siril_flat.script $destdir/scripts/siril_flat.script
-install -v -m 755 scripts/siril_light_filter.script $destdir/scripts/siril_light_filter.script
 install -v -m 755 scripts/siril_light.script $destdir/scripts/siril_light.script
 install -v -m 755 scripts/siril/template_bias.ssf  $destdir/scripts/siril/template_bias.ssf
 install -v -m 755 scripts/siril/template_dark.ssf  $destdir/scripts/siril/template_dark.ssf
 install -v -m 755 scripts/siril/template_flat.ssf  $destdir/scripts/siril/template_flat.ssf
 install -v -m 755 scripts/siril/template_light.ssf  $destdir/scripts/siril/template_light.ssf
-install -v -m 755 scripts/siril/template_flat_filter.ssf  $destdir/scripts/siril/template_flat_filter.ssf
-install -v -m 755 scripts/siril/template_light_filter.ssf  $destdir/scripts/siril/template_light_filter.ssf
 install -v -m 644 data/stars/focus_star_4   $destdir/data/stars/focus_star_4
 install -v -m 644 data/stars/focus_star_5   $destdir/data/stars/focus_star_5
 install -v -m 644 data/stars/focus_star_6   $destdir/data/stars/focus_star_6

install_win.sh

@@ -43,16 +43,12 @@ install -v -m 755 scripts/astrometry-online.sh  $destdir/scripts/astrometry-onli
 install -v -m 755 scripts/astrometry-macos.sh  $destdir/scripts/astrometry-macos.sh
 install -v -m 755 scripts/siril_bias.script  $destdir/scripts/siril_bias.script
 install -v -m 755 scripts/siril_dark.script $destdir/scripts/siril_dark.script
-install -v -m 755 scripts/siril_flat_filter.script $destdir/scripts/siril_flat_filter.script
 install -v -m 755 scripts/siril_flat.script $destdir/scripts/siril_flat.script
-install -v -m 755 scripts/siril_light_filter.script $destdir/scripts/siril_light_filter.script
 install -v -m 755 scripts/siril_light.script $destdir/scripts/siril_light.script
 install -v -m 755 scripts/siril/template_bias.ssf  $destdir/scripts/siril/template_bias.ssf
 install -v -m 755 scripts/siril/template_dark.ssf  $destdir/scripts/siril/template_dark.ssf
 install -v -m 755 scripts/siril/template_flat.ssf  $destdir/scripts/siril/template_flat.ssf
 install -v -m 755 scripts/siril/template_light.ssf  $destdir/scripts/siril/template_light.ssf
-install -v -m 755 scripts/siril/template_flat_filter.ssf  $destdir/scripts/siril/template_flat_filter.ssf
-install -v -m 755 scripts/siril/template_light_filter.ssf  $destdir/scripts/siril/template_light_filter.ssf
 install -v -m 644 data/stars/focus_star_4   $destdir/data/stars/focus_star_4
 install -v -m 644 data/stars/focus_star_5   $destdir/data/stars/focus_star_5
 install -v -m 644 data/stars/focus_star_6   $destdir/data/stars/focus_star_6

install_win_dual.sh

@@ -43,16 +43,12 @@ install -v -m 755 scripts/astrometry-online.sh  $destdir/scripts/astrometry-onli
 install -v -m 755 scripts/astrometry-macos.sh  $destdir/scripts/astrometry-macos.sh
 install -v -m 755 scripts/siril_bias.script  $destdir/scripts/siril_bias.script
 install -v -m 755 scripts/siril_dark.script $destdir/scripts/siril_dark.script
-install -v -m 755 scripts/siril_flat_filter.script $destdir/scripts/siril_flat_filter.script
 install -v -m 755 scripts/siril_flat.script $destdir/scripts/siril_flat.script
-install -v -m 755 scripts/siril_light_filter.script $destdir/scripts/siril_light_filter.script
 install -v -m 755 scripts/siril_light.script $destdir/scripts/siril_light.script
 install -v -m 755 scripts/siril/template_bias.ssf  $destdir/scripts/siril/template_bias.ssf
 install -v -m 755 scripts/siril/template_dark.ssf  $destdir/scripts/siril/template_dark.ssf
 install -v -m 755 scripts/siril/template_flat.ssf  $destdir/scripts/siril/template_flat.ssf
 install -v -m 755 scripts/siril/template_light.ssf  $destdir/scripts/siril/template_light.ssf
-install -v -m 755 scripts/siril/template_flat_filter.ssf  $destdir/scripts/siril/template_flat_filter.ssf
-install -v -m 755 scripts/siril/template_light_filter.ssf  $destdir/scripts/siril/template_light_filter.ssf
 install -v -m 644 data/stars/focus_star_4   $destdir/data/stars/focus_star_4
 install -v -m 644 data/stars/focus_star_5   $destdir/data/stars/focus_star_5
 install -v -m 644 data/stars/focus_star_6   $destdir/data/stars/focus_star_6

scripts/siril/template_flat.ssf

@@ -1,7 +1,7 @@
 ############################################
 # Script for Siril
 # Template for CCDciel preprocessing 
-# Create master flat without filter
+# Create master flat
 ############################################
 
 setext fits
@@ -10,11 +10,11 @@ cd $BASEDIR
 
 #preprocess flats
 cd $FLATDIR
-preprocess $FLATPREFIX_ -bias=$MASTERBIAS
+preprocess $FLATPREFIX$FILTER_ -bias=$MASTERBIAS
 #build master-flat
-stack pp_$FLATPREFIX_ rej 3 3 -norm=mul
+stack pp_$FLATPREFIX$FILTER_ rej 3 3 -norm=mul
 
-load pp_$FLATPREFIX_stacked.fits
-save Master_Flat.fits
+load pp_$FLATPREFIX$FILTER_stacked.fits
+save Master_Flat$FILTER.fits
 
 close

scripts/siril/template_flat_filter.ssf

@@ -1,7 +1,7 @@
 ############################################
 # Script for Siril
 # Template for CCDciel preprocessing 
-# Preprocess a series without filter
+# Preprocess a series
 ############################################
 
 setext fits
@@ -10,15 +10,15 @@ cd $BASEDIR
 
 #preprocess lights
 cd $LIGHTDIR
-preprocess $LIGHTPREFIX_ -dark=$MASTERDARK -flat=$MASTERFLAT
+preprocess $LIGHTPREFIX$FILTER_ -dark=$MASTERDARK -flat=$MASTERFLAT$FILTER
 
 ## stop here because stacking probably need some manual selection
 ## but you can uncomment the register and stack command if you want
 
 ##align lights
-#register pp_$LIGHTPREFIX_
+#register pp_$LIGHTPREFIX$FILTER_
 
 ##stack calibrated lights
-#stack r_pp_$LIGHTPREFIX_ rej 3 3 -norm=addscale
+#stack r_pp_$LIGHTPREFIX$FILTER_ rej 3 3 -norm=addscale
 
 close

scripts/siril/template_light.ssf

@@ -1,14 +1,14 @@
 // CCDciel script to process files with Siril
 //
-// Create Master Flat without filter
+// Create Master Flat with filter
 //
 
 var
   buf,sirilcmd: string;
-  script,log: Tstringlist;
-  i: Integer;
-  DirectorySeparator,appdir,tmpdir,siriltemplatedir: string;
-  basedir,biasdir,flatdir,masterbias,flatprefix: string;
+  script,log, filterlist: Tstringlist;
+  i,f: Integer;
+  DirectorySeparator,appdir,tmpdir,siriltemplatedir,r: string;
+  basedir,biasdir,flatdir,masterbias,flatprefix,filter: string;
 
 begin
 
@@ -30,7 +30,27 @@ begin
   GetS('APPDIR', appdir);
   siriltemplatedir:=appdir+DirectorySeparator+'scripts'+DirectorySeparator+'siril';
   GetS('TMPDIR', tmpdir);
-  
+
+  // Get the list of filter name
+  //
+  filterlist:= Tstringlist.create;
+  r:=cmdArg('WHEEL_GETFILTERSNAME',filterlist);
+  if r<>msgOK then exit;
+
+
+  // Loop for filter name
+  //
+  for f:=-1 to filterlist.count-1 do begin
+
+    if f<0 then 
+       filter:=''
+    else begin   
+      filter :=filterlist[f];
+      if trim(filter)='' then continue;
+      filter:='_'+filter;
+    end;  
+    logmsg('Process Flat'+filter);
+
     // Replace variable in template
     script:= Tstringlist.create;
     script.loadfromfile(siriltemplatedir+DirectorySeparator+'template_flat.ssf');
@@ -40,6 +60,7 @@ begin
       buf:=StringReplace(buf, '$FLATDIR', flatdir);
       buf:=StringReplace(buf, '$MASTERBIAS', masterbias);
       buf:=StringReplace(buf, '$FLATPREFIX', flatprefix);
+      buf:=StringReplace(buf, '$FILTER', filter);
       script[i]:=buf;
     end;
     SaveSL(tmpdir+DirectorySeparator+'tmp.ssf',script);
@@ -48,14 +69,17 @@ begin
     // Run Siril
     log:=Tstringlist.Create;
     RunOutput(sirilcmd+' -s '+tmpdir+DirectorySeparator+'tmp.ssf',log);
-    log.savetofile(basedir+DirectorySeparator+'siril_flat.log');
+    log.savetofile(basedir+DirectorySeparator+'siril_flat'+filter+'.log');
     log.free;
 
     // Cleanup
-    Deletefile(basedir+DirectorySeparator+flatdir+DirectorySeparator+flatprefix+'_.seq');
-    Deletefile(basedir+DirectorySeparator+flatdir+DirectorySeparator+'pp_'+flatprefix+'_stacked.fits');
-    Deletefile(basedir+DirectorySeparator+flatdir+DirectorySeparator+'pp_'+flatprefix+'_*.fits');
-    Deletefile(basedir+DirectorySeparator+flatdir+DirectorySeparator+'pp_'+flatprefix+'_.seq');
+    Deletefile(basedir+DirectorySeparator+flatdir+DirectorySeparator+flatprefix+'*_.seq');
+    Deletefile(basedir+DirectorySeparator+flatdir+DirectorySeparator+'pp_'+flatprefix+filter+'_stacked.fits');
+    Deletefile(basedir+DirectorySeparator+flatdir+DirectorySeparator+'pp_'+flatprefix+filter+'_*.fits');
+    Deletefile(basedir+DirectorySeparator+flatdir+DirectorySeparator+'pp_'+flatprefix+filter+'_.seq');
+
+  end;
 
+  filterlist.free;
 
 end.