From 9e0425ef40083a55b674d8a80060542eb23c0288 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 5 Jan 2024 07:01:55 -0500 Subject: [PATCH] Save and restore the "fac0" scaling value. --- qmap/libqmap/read_qm.f90 | 8 +++++--- qmap/libqmap/save_qm.f90 | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/qmap/libqmap/read_qm.f90 b/qmap/libqmap/read_qm.f90 index f5f7615c8..c7d977ae4 100644 --- a/qmap/libqmap/read_qm.f90 +++ b/qmap/libqmap/read_qm.f90 @@ -5,17 +5,19 @@ subroutine read_qm(fname) character*(*) fname character prog_id*24,mycall*12,mygrid*6 real*8 fcenter - integer nxtra(16) !For possible future additions + integer nxtra(15) !For possible future additions integer*1 id1(2,NMAX) common/datcom/dd(2,5760000),ss(400,NFFT),savg(NFFT),fcenter,nutc,junk(NJUNK) open(28,file=trim(fname),status='old',access='stream',err=900) read(28) prog_id,mycall,mygrid,fcenter,nutc,ntx30a,ntx30b,ndop00,ndop58, & - ia,ib,nxtra + ia,ib,fac0,nxtra + fac=1.0 + if(fac0.gt.0.0) fac=1.0/fac0 id1=0 read(28) id1(1:2,ia:ib) dd=0. - dd(1:2,ia:ib)=2.4*id1(1:2,ia:ib) !### Why the boost by 2.4 ??? + dd(1:2,ia:ib)=fac*id1(1:2,ia:ib) !Boost back to previous level ! write(*,3001) prog_id,mycall(1:6),mygrid,fcenter,nutc,ntx30a,ntx30b, & ! ndop00,ndop58,ia,ib diff --git a/qmap/libqmap/save_qm.f90 b/qmap/libqmap/save_qm.f90 index edf7b3882..bf9f6f424 100644 --- a/qmap/libqmap/save_qm.f90 +++ b/qmap/libqmap/save_qm.f90 @@ -6,7 +6,7 @@ subroutine save_qm(fname,prog_id,mycall,mygrid,dd,ntx30a,ntx30b,fcenter, & character prog_id_24*24,mycall_12*12,mygrid_6*6 real*4 dd(2,NMAX) real*8 fcenter - integer nxtra(16) !For possible future additions + integer nxtra(15) !For possible future additions integer*1 id1(2,NMAX) ia=1 @@ -25,10 +25,10 @@ subroutine save_qm(fname,prog_id,mycall,mygrid,dd,ntx30a,ntx30b,fcenter, & nbad=0 dmax=0. - fac=10.0/rms + fac0=10.0/rms do i=ia,ib - x=fac*dd(1,i) - y=fac*dd(2,i) + x=fac0*dd(1,i) + y=fac0*dd(2,i) ax=abs(x) ay=abs(y) dmax=max(dmax,ax,ay) @@ -57,7 +57,7 @@ subroutine save_qm(fname,prog_id,mycall,mygrid,dd,ntx30a,ntx30b,fcenter, & mycall_12=mycall mygrid_6=mygrid write(29) prog_id_24,mycall_12,mygrid_6,fcenter,nutc,ntx30a,ntx30b, & - ndop00,ndop58,ia,ib,nxtra !Write header to disk + ndop00,ndop58,ia,ib,fac0,nxtra !Write header to disk write(29) id1(1:2,ia:ib) !Write 8-bit data to disk close(29)