Merge pull request #174 from VERITAS-Observatory/v487c-dev

V487c Patch releases
VERITAS-Observatory · May 25, 2022 · a3d7ab0 · a3d7ab0
2 parents da9bb3e + b6c9337
commit a3d7ab0
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -283,7 +283,6 @@ all VTS:	evndisp \
 	VTS.getRunListFromDB \
 	VTS.getLaserRunFromDB \
 	VTS.getRun_TimeElevAzim \
-	printRunParameter \
 	writeParticleRateFilesForTMVA \
 	writelaserinDB \
 	logFile
@@ -1406,7 +1405,7 @@ VTS.next_day:	./obj/VFITS.o ./obj/VFITS_Dict.o \
 		./obj/CEffArea.o ./obj/CEffArea_Dict.o \
 		./obj/VFluxCalculation.o ./obj/VFluxCalculation_Dict.o \
 		./obj/VLightCurve.o ./obj/VLightCurve_Dict.o \
-		./obj/VLightCurveData.o \
+		./obj/VLightCurveData.o ./obj/VLightCurveData_Dict.o \
 		./obj/VLightCurveUtilities.o ./obj/VLightCurveUtilities_Dict.o \
 		./obj/VGlobalRunParameter.o ./obj/VGlobalRunParameter_Dict.o \
 		./obj/VTS.next_day.o
@@ -1915,8 +1914,6 @@ else
 	@echo "CTA_USER_DATA_DIR set to $(CTA_USER_DATA_DIR)"
 endif
 
-
-
 ###############################################################################################################################
 # source code formating
 ###############################################################################################################################
@@ -1932,7 +1929,10 @@ install:	all
 
 ###############################################################################################################################
 clean:
-	-rm -f ./obj/*.o ./obj/*_Dict.cpp ./obj/*_Dict.h ./lib/*.pcm
+	-rm -f ./obj/*.o ./obj/*_Dict.cpp ./obj/*_Dict.h ./lib/*.pcm ./obj/*.pcm ./bin/*.pcm
+
+rclean:
+	-rm -f ./obj/*.o ./obj/*_Dict.cpp ./obj/*_Dict.h ./bin/* ./lib/libVAnaSum.so ./lib/*.pcm ./obj/*dict.pcm ./bin/*.pcm
 ###############################################################################################################################
 
 .PHONY: all clean install FORCEDISTDIR dist TESTHESSIO TESTFITS configuration
diff --git a/inc/VPointingDB.h b/inc/VPointingDB.h
@@ -68,6 +68,8 @@ class VPointingDB : public VGlobalRunParameter
 		vector< double > fDBTime;
 		vector< float > fDBTelElevationRaw;
 		vector< float > fDBTelAzimuthRaw;
+        vector< float > fDBTelRA;
+        vector< float > fDBTelDec;
 		vector< float > fDBTelElevation;
 		vector< float > fDBTelAzimuth;
 		vector< float > fDBTelExpectedElevation;

diff --git a/src/VDataMCComparision.cpp b/src/VDataMCComparision.cpp
@@ -151,7 +151,7 @@ bool VDataMCComparision::setTelescopeCoordinates( double x, double y, double z )
 	fTel_x.push_back( x );
 	fTel_y.push_back( y );
 	fTel_z.push_back( z );
-	cout << "\t setting telescope coordinates for telescope " << fTel_x.size() + 1 << "\t" << x << "\t" << y << "\t" << z << endl;
+	cout << "\t setting telescope coordinates for telescope " << fTel_x.size() << "\t" << x << "\t" << y << "\t" << z << endl;
 	return true;
 }
 

diff --git a/src/VPointingDB.cpp b/src/VPointingDB.cpp
@@ -463,6 +463,8 @@ bool VPointingDB::readPointingFromVPMTextFile( string iDirectory )
 			fDBTime.push_back( iITime * 86400. );
 			fDBTelElevationRaw.push_back( 0. );
 			fDBTelAzimuthRaw.push_back( 0. );
+            fDBTelRA.push_back( iRA * degrad );
+            fDBTelDec.push_back( iDec * degrad );
 			getHorizonCoordinates( fDBMJD.back(), fDBTime.back(), iDec * degrad, iRA * degrad, az, ze );
 			fDBTelElevation.push_back( 90. - ze );
 			fDBTelAzimuth.push_back( az );
@@ -607,6 +609,8 @@ bool VPointingDB::readPointingCalibratedVPMFromDB()
 
 		iRA = atof( db_row->GetField( 1 ) );
 		iDec = atof( db_row->GetField( 2 ) );
+        fDBTelRA.push_back( iRA * degrad );
+        fDBTelDec.push_back( iDec * degrad );
 		getHorizonCoordinates( fDBMJD.back(), fDBTime.back(), iDec * degrad, iRA * degrad, az, ze );
 		fDBTelElevation.push_back( 90. - ze );
 		fDBTelAzimuth.push_back( az );
@@ -846,6 +850,8 @@ bool VPointingDB::readPointingFromDB()
 		fDBTelAzimuthRaw.push_back( atof( db_row->GetField( 2 ) ) * 180. / TMath::Pi() );
 		fDBTelElevation.push_back( el * 180. / TMath::Pi() );
 		fDBTelAzimuth.push_back( az * 180. / TMath::Pi() );
+        fDBTelRA.push_back( 0. );
+        fDBTelDec.push_back( 0. );
 		fDBTelExpectedElevation.push_back( atof( db_row->GetField( 5 ) ) * 180. / TMath::Pi() );
 		fDBTelExpectedAzimuth.push_back( atof( db_row->GetField( 6 ) ) * 180. / TMath::Pi() );
 	}
@@ -898,6 +904,8 @@ TTree* VPointingDB::getTreePointingDB()
 	float iTelAz = 0.;
 	float iTelElT = 0.;
 	float iTelAzT = 0.;
+    float iTelRA = 0.;
+    float iTelDec = 0.;
 
 	sprintf( hname, "db_pointing_%d", getTelID() + 1 );
 	sprintf( htitle, "pointing from DB (Telescope %d)", getTelID() + 1 );
@@ -913,6 +921,9 @@ TTree* VPointingDB::getTreePointingDB()
         // expected elevation / azimuth (value requested by pointing software)
 	tD->Branch( "ElTelExpected", &iTelElT, "ElTelExpected/F" );
 	tD->Branch( "AzTelExpected", &iTelAzT, "AzTelExpected/F" );
+    // ra/dec as read from DB
+    tD->Branch("RA", &iTelRA, "RA/F" );
+    tD->Branch("Dec", &iTelDec, "Dec/F" );
 
 	for( unsigned int i = 0; i < fDBMJD.size(); i++ )
 	{
@@ -924,6 +935,8 @@ TTree* VPointingDB::getTreePointingDB()
 		iTelAz = fDBTelAzimuth[i];
 		iTelElT = fDBTelExpectedElevation[i];
 		iTelAzT = fDBTelExpectedAzimuth[i];
+        iTelRA = fDBTelRA[i];
+        iTelDec = fDBTelDec[i];
 
 		tD->Fill();
 	}

diff --git a/src/combineEffectiveAreas.cpp b/src/combineEffectiveAreas.cpp
@@ -491,15 +491,15 @@ int main( int argc, char* argv[] )
 	if( argc < 4 )
 	{
 		cout << endl;
-		cout << "combineEffectiveAreas <effective area files> <combined file> <tree type>" << endl; 
-                cout << endl;
-                cout << "  <tree type>  effective area tree type (defines size of combined tree)" << endl;
-                cout << "                - DL3 (default): entries required for DL3 analyis (large)" << endl;
-                cout << "                - all          : all entries of original trees (largest)" << endl;
-                cout << "                - anasum       : entries required for anasum analysis only (smallest)" << endl;
-                cout << "                - DL3reduced   : histograms are written as regular arrays for DL3 analysis" << endl;
+		cout << "combineEffectiveAreas <effective area file list> <combined file> <tree type>" << endl; 
+        cout << endl;
+        cout << "  <effective area file list>  list of effective files to be merged" << endl;
+        cout << "  <tree type>  effective area tree type (defines size of combined tree)" << endl;
+        cout << "                - DL3 (default): entries required for DL3 analyis (large)" << endl;
+        cout << "                - all          : all entries of original trees (largest)" << endl;
+        cout << "                - anasum       : entries required for anasum analysis only (smallest)" << endl;
+        cout << "                - DL3reduced   : histograms are written as regular arrays for DL3 analysis" << endl;
 		cout << endl;
-		cout << "   <effective area files>    without .root suffix (e.g. effArea*. Note need of \"...\")" << endl;
 		cout << endl;
 		exit( EXIT_FAILURE );
 	}
@@ -508,7 +508,7 @@ int main( int argc, char* argv[] )
 	cout << "------------------------------------" << endl;
 	cout << endl;
 
-        vector< string > file_list = readListOfFiles( argv[1] );
+    vector< string > file_list = readListOfFiles( argv[1] );
 
 	merge( file_list, argv[2], argv[3] );
     write_reduced_merged_tree( file_list, argv[2], argv[3] );