Commit 8560085a authored by Timothy Shippert's avatar Timothy Shippert
Browse files

Removed Barnard key channel test; updated dsproc_test.cfg to include 7nch run

parent 9ee1b0c5
......@@ -96,6 +96,9 @@ DATA* barnard_langley (DATA *D, float *gNomCal)
float dvalue;
int kstart; // start of narrowband channels, either k=0 for 7nch or k=1
// for bb/6nch configuration
/* function prototypes */
DATA* maker_AllocateMemoryForDATA();
......@@ -294,7 +297,7 @@ DATA* barnard_langley (DATA *D, float *gNomCal)
// If broadband exists, put it first, otherwise, just loop
// over NCHANN
int kstart=1; // first narrowband channel in lnI[k] field
kstart=1; // first narrowband channel in lnI[k] field
if (D->nSamples[B1][o][0][IN_BROADBAND] == 0) {
// This means we have 7 narrowband channels
......@@ -440,7 +443,11 @@ DATA* barnard_langley (DATA *D, float *gNomCal)
sigi *= sigp;
#endif /* end ifdef OLDFIT */
#define SIGLIM (k==1 ? .015 : .01)
// This is dependent on broadband or not, and thus we can't
// assume the 415nm channel is still k=1. So, work with
// kstart, which is the first narrowband channel no matter
// what
#define SIGLIM (k==kstart ? .015 : .01)
old_rej = nrej;
......@@ -535,6 +542,16 @@ DATA* barnard_langley (DATA *D, float *gNomCal)
} /* end for (k... */
#undef BARNARD_KEY_CHANNEL_TEST
#ifdef BARNARD_KEY_CHANNEL_TEST
// It is my contention that this KEY_CHN test was both coded up wrong
// and ill-considered to begin with. At the very least, we have to
// put the assignment to MISSING after doing this check, if we want
// to color the other channels as good if the key channel is good.
// Also, I'm still not sure the KEY_CHN should be the 415nm channel
// in barnard, as it is the 500nm channel in Michalsky - but of
// course it's used differently there anyway.
/* if key chn is good all chns are good */
if (newD->BWdata[LANGLEY][0][0][BAD_FLAG + KEY_CHN][i][0] == 0)
{
......@@ -547,7 +564,8 @@ DATA* barnard_langley (DATA *D, float *gNomCal)
if (newD->BWdata[LANGLEY][0][0][BAD_FLAG + k][i][0] == 0)
newD->BWdata[LANGLEY][0][0][BAD_FLAG + k][i][0] = 4;
} /* end else */
#endif /* BARNARD_KEY_CHANNEL_TEST */
/* report time in the middle of this slab. I do this way down */
/* here so I can trap on badflags in a later version if I want */
for (f=0; f<newD->nFields[LANGLEY][0]; f++)
......
......@@ -50,12 +50,6 @@ GDB_COMMAND ddd
DATA_ROOT /data/home/dev/vap/langley/DATA
#--------------------------------
PROCESS langley_mfrsr7nch vap
COMMAND $(GDB) $(VAP_BIN)/langley -n langley_mfrsr7nch -s $(SITE) -f $(FAC) -b $(BEGIN) -e $(END) $(DEBUG) $(DBALIAS)
RUN sgp E38 20190915 20190916
#-----------------------------------------------------------------------------
PROCESS langley_mfrsr vap
......@@ -85,3 +79,8 @@ RUN nsa C1 20040604 20040605
RUN nsa C1 20040704 20040705
#--------------------------------
PROCESS langley_mfrsr7nch vap
COMMAND $(GDB) $(VAP_BIN)/langley -n langley_mfrsr7nch -s $(SITE) -f $(FAC) -b $(BEGIN) -e $(END) $(DEBUG) $(DBALIAS)
RUN sgp E38 20190915 20190916
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