Commit c3054faa authored by aorlati's avatar aorlati Committed by carlomigoni
Browse files

fix #219: section is now a spectra section when the type is LCP o RCP and the... 

fix #219: section is now a spectra section when the type is LCP o RCP and the number of spectral bins is greateer than 1 (#220)
parent 5c150dd0

Common/Servers/FitsWriter/src/Configuration.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ using namespace FitsWriter_private; 
	} \

	else { \

		FIELD=tmpw; \

		ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \

		ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %u",tmpw); \

	} \

}

Common/Servers/FitsWriter/src/DataCollection.cpp

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ bool CDataCollection::setSubScanSetup(const Management::TSubScanSetup& setup,boo 
	////*******************************************************

	IRA::CString outstr;

	IRA::CIRATools::timeToStr(setup.startUt,outstr);

	ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_NOTICE,"SUBSCAN IS %ld",setup.subScanId));

	ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_NOTICE,"SUBSCAN IS %ld",(long)setup.subScanId));

	ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_NOTICE,"REQUESTED_START_TIME WAS %s",(const char *)outstr));

	///////////// DEBUGGING ***************************************

	if (m_start && m_running) {

Common/Servers/FitsWriter/src/FitsWriter.cpp

+6 −1
Original line number Diff line number Diff line
@@ -526,7 +526,12 @@ bool CFitsWriter::addSectionTable(const ACS::longSeq &sectionID, const ACS::long 
			type << (4 * bins[i]) << data_type; //full stokes

		}

		else {

			if (bins[i]==1) {

				sect_type.push_back("simple");

			}

			else {

				sect_type.push_back("spectra");

			}

			type <<  (1 * bins[i]) << data_type;

		}

		if (!noData) {

Common/Servers/FitsWriter/src/FitsWriterImpl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
#include "DevIODeviceID.h"

#include "DevIOScanAxis.h"



static char *rcsId="@(#) $Id: FitsWriterImpl.cpp,v 1.12 2011-06-21 16:38:41 a.orlati Exp $";

static void *use_rcsId = ((void)&use_rcsId,(void *) &rcsId);

//static char *rcsId="@(#) $Id: FitsWriterImpl.cpp,v 1.12 2011-06-21 16:38:41 a.orlati Exp $";

//static void *use_rcsId = ((void)&use_rcsId,(void *) &rcsId);



#define WORKTHREADNAME "FITSENGINE"

#define COLLECTORTHREADNAME "COLLECTORTHREAD"

Common/Servers/FitsWriter/src/TestWriter.cpp

+12 −4
Original line number Diff line number Diff line
@@ -63,14 +63,22 @@ int main(int argc, char *argv[]) 
	for (int i=0;i<SECTIONS;i++) {

		cH[i].id=i;  

		cH[i].bins=BINS;

		/*if (i==0) {

			cH[i].polarization=Backends::BKND_LCP;  

			cH[i].inputs=1;

			cH[i].IF[0]=0;

		}

		else {*/

			cH[i].polarization=Backends::BKND_FULL_STOKES;  

			cH[i].inputs=2;

			cH[i].IF[0]=0;

			cH[i].IF[1]=1;

		//}

		cH[i].bandWidth=2000.0;				

		cH[i].frequency=110.0;                

		cH[i].attenuation[0]=9.0;

		cH[i].attenuation[1]=14.0;

		cH[i].IF[0]=0;

		cH[i].IF[1]=1;



		cH[i].sampleRate=0.000025;              

		cH[i].feed=i;

		los[i*2]=los[i*2+1]=8080;