Unverified Commit aa693f6b authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

Merge pull request #767 from discos/stable 

Porting latest hotfix into master.
parents fca768e0 8e33f7b1

Common/Servers/Scheduler/src/Core_Operations.i

+19 −9
Original line number Diff line number Diff line
@@ -1101,6 +1101,7 @@ void CCore::_callTSys(ACS::doubleSeq& tsys) throw (ComponentErrors::CouldntGetCo 
	ratio.length(inputs);

	tsys.length(inputs);

	for (int i=0;i<inputs;i++) {

		if ((i<(int)tpiCal->length()) && (i<(int)tpi->length()) && (i<(int)zero->length()) && (i<(int)mark->length())) {

			if ((mark[i]>0.0) && (tpiCal[i]>tpi[i])) {

				//ratio[i]=(tpiCal[i]-tpi[i])/mark[i];

				ratio[i]=mark[i]/(tpiCal[i]-tpi[i]);
@@ -1112,6 +1113,11 @@ void CCore::_callTSys(ACS::doubleSeq& tsys) throw (ComponentErrors::CouldntGetCo 
				tsys[i]=-1.0;

			}

		}

		else {

			ratio[i]=1.0;

			tsys[i]=-1.0;

		}

	}

	//Now contact the backend to give back some results.....

	try {

		backend->setKelvinCountsRatio(ratio,tsys);
@@ -1126,13 +1132,17 @@ void CCore::_callTSys(ACS::doubleSeq& tsys) throw (ComponentErrors::CouldntGetCo 
	for (int i=0;i<inputs;i++) {

		outLog.Format("DEVICE/%d Feed: %d, IF: %d, Freq: %lf, Bw: %lf/",i,feed[i],IFs[i],freq[i],bandWidth[i]);

		ACS_LOG(LM_FULL_INFO,"CCore::callTSys()",(LM_NOTICE,(const char *)outLog));

		outLog.Format("CALTEMP/%d %lf(%lf)",i,mark[i],scaleFactor);

		if (i<(int)mark->length()) outLog.Format("CALTEMP/%d %lf(%lf)",i,mark[i],scaleFactor);

		else outLog.Format("CALTEMP/%d %lf(%lf)",i,-1.0,scaleFactor);

		ACS_LOG(LM_FULL_INFO,"CCore::callTSys()",(LM_NOTICE,(const char *)outLog));

		outLog.Format("TPICAL/%d %lf",i,tpiCal[i]);

		if (i<(int)tpiCal->length()) outLog.Format("TPICAL/%d %lf",i,tpiCal[i]);

		else outLog.Format("TPICAL/%d %lf",i,-1.0);

		ACS_LOG(LM_FULL_INFO,"CCore::callTSys()",(LM_NOTICE,(const char *)outLog));

		outLog.Format("TPIZERO/%d %lf",i,zero[i]);

		if (i<(int)zero->length()) outLog.Format("TPIZERO/%d %lf",i,zero[i]);

		else outLog.Format("TPIZERO/%d %lf",i,-1.0);

		ACS_LOG(LM_FULL_INFO,"CCore::callTSys()",(LM_NOTICE,(const char *)outLog));

		outLog.Format("TPI/%d %lf",i,tpi[i]);

		if (i<(int)tpi->length()) outLog.Format("TPI/%d %lf",i,tpi[i]);

		else outLog.Format("TPI/%d %lf",i,-1.0);

		ACS_LOG(LM_FULL_INFO,"CCore::callTSys()",(LM_NOTICE,(const char *)outLog));

		outLog.Format("TSYS/%d %lf",i,tsys[i]);

		ACS_LOG(LM_FULL_INFO,"CCore::callTSys()",(LM_NOTICE,(const char *)outLog));

Medicina/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
               CommandLineTimeout="100000000"

               ConnectTimeout="300000000"

               PropertyRefreshTime="1000000"

               Configuration="SCC00"

               Configuration="SC00"

               TimeTollerance="250000"

               RepetitionCacheTime="2000000"

               RepetitionExpireTime="5000000"