From 5749451819fb224057ecd2f66f2638daf40db9ee Mon Sep 17 00:00:00 2001
From: Grant Meadors <gdmeadors@gmail.com>
Date: Mon, 19 Nov 2012 20:09:38 -0800
Subject: [PATCH] Made improvements to spec_avg so it prints out about 5/16 Hz
 around 850 Hz.

---
 runspecS6H1feedforward |  2 +-
 runspecS6H1test        |  2 +-
 spec_avg.c             | 25 ++++++++++++++-----------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/runspecS6H1feedforward b/runspecS6H1feedforward
index 3256f85..0f140b4 100755
--- a/runspecS6H1feedforward
+++ b/runspecS6H1feedforward
@@ -1,3 +1,3 @@
 #/bin/csh
 
-/home/keithr/master/opt/lscsoft/lalapps/bin/lalapps_spec_avg --SFTs /archive/frames/S6/pulsar/sfts/feedforward/hann/H-1_H1_1800SFT_AMPSC02L2-931/\*.sft\;/archive/frames/S6/pulsar/sfts/feedforward/hann/H-1_H1_1800SFT_AMPSC02L2-932/\*.sft  --startGPS 931000000 --endGPS 932810000 --fMin 40. --fMax 1999.999 --freqRes 0.10 --timeBaseline 1800 -v 3 --IFO H1 --outputBname S6H1_Hann_40_2000feedforward
+/home/gmeadors/master/opt/lscsoft/lalapps/bin/lalapps_spec_avg --SFTs /archive/frames/S6/pulsar/sfts/feedforward/hann/H-1_H1_1800SFT_AMPSC02L2-931/\*.sft\;/archive/frames/S6/pulsar/sfts/feedforward/hann/H-1_H1_1800SFT_AMPSC02L2-932/\*.sft  --startGPS 931000000 --endGPS 932810000 --fMin 40. --fMax 1999.999 --freqRes 0.10 --timeBaseline 1800 -v 3 --IFO H1 --outputBname S6H1_Hann_40_2000feedforward
diff --git a/runspecS6H1test b/runspecS6H1test
index ef658a8..94a701e 100755
--- a/runspecS6H1test
+++ b/runspecS6H1test
@@ -1,4 +1,4 @@
 #/bin/csh
 
-/home/keithr/master/opt/lscsoft/lalapps/bin/lalapps_spec_avg --SFTs /archive/frames/S6/pulsar/sfts/feedforward/beforeHann/H-1_H1_1800SFT_AMPSC02L2-931/\*.sft\;/archive/frames/S6/pulsar/sfts/feedforward/beforeHann/H-1_H1_1800SFT_AMPSC02L2-932/\*.sft  --startGPS 931000000 --endGPS 932810000 --fMin 40. --fMax 1999.999 --freqRes 0.10 --timeBaseline 1800 -v 3 --IFO H1 --outputBname S6H1_Hann_40_2000test
+/home/gmeadors/master/opt/lscsoft/lalapps/bin/lalapps_spec_avg --SFTs /archive/frames/S6/pulsar/sfts/feedforward/beforeHann/H-1_H1_1800SFT_AMPSC02L2-931/\*.sft\;/archive/frames/S6/pulsar/sfts/feedforward/beforeHann/H-1_H1_1800SFT_AMPSC02L2-932/\*.sft  --startGPS 931000000 --endGPS 932810000 --fMin 40. --fMax 1999.999 --freqRes 0.10 --timeBaseline 1800 -v 3 --IFO H1 --outputBname S6H1_Hann_40_2000test
 
diff --git a/spec_avg.c b/spec_avg.c
index 64410b9..17354fe 100644
--- a/spec_avg.c
+++ b/spec_avg.c
@@ -253,19 +253,22 @@ int main(int argc, char **argv)
 		}
 	      }
 	    thisavepower /= count;
-            if (i >= 1457995 && i <= 1458005)
+            // Print out the calibrated ASD bin value over about 5/16 Hz,
+            // centered on 850 Hz.
+            if (i >= 1457719 && i <= 1458281)
               {
                 f = f0 + ((REAL4)i)*deltaF;
-                printf("SFT number=%d\n",j);
-                printf("Frequency=%f\n",f);
-                printf("Bin=%d\n",i);
-                printf("Real component=%f\n", sft_vect->data[0].data->data[i].re);
-                printf("Imaginary component=%f\n", sft_vect->data[0].data->data[i].im);
-                printf("Bin power=%f\n", thispower);
-                printf("Bin-neighbor average power=%f\n", thisavepower);
-                printf("Scale-factor=%f\n", scalefactor);
-                printf("Time baseline=%f\n", timebaseline);
-                fprintf(fp5,"%d %16.8f %g %g %g %g\n",j, f, thispower, thisavepower, scalefactor, timebaseline);
+                //printf("SFT number=%d\n",j);
+                //printf("Frequency=%f\n",f);
+                //printf("Bin=%d\n",i);
+                //printf("Real component=%f\n", sft_vect->data[0].data->data[i].re);
+                //printf("Imaginary component=%f\n", sft_vect->data[0].data->data[i].im);
+                //printf("Bin power=%f\n", thispower);
+                //printf("Bin-neighbor average power=%f\n", thisavepower);
+                //printf("Scale-factor=%f\n", scalefactor);
+                //printf("Time baseline=%f\n", timebaseline);
+                printf("%f\n", pow(2*thispower/scalefactor/scalefactor/timebaseline, 0.5));
+                fprintf(fp5,"%d %16.8f %g %g %g %g\n",j, f, thispower, pow(2*thispower/scalefactor/scalefactor/timebaseline,0.5), scalefactor, timebaseline);
               }
 	    weight = 1./thisavepower;
 	    //	    weight = 1.;
-- 
GitLab