From d602a6743e5f7714736fe872e7dbc4aaffc31a33 Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Tue, 29 Oct 2024 18:19:52 +0100 Subject: [PATCH 1/5] removed obsolete noisePE values --- inc/VEffectiveAreaCalculator.h | 1 - src/VEffectiveAreaCalculator.cpp | 4 ---- 2 files changed, 5 deletions(-) diff --git a/inc/VEffectiveAreaCalculator.h b/inc/VEffectiveAreaCalculator.h index 9c5562b8..13367a2a 100644 --- a/inc/VEffectiveAreaCalculator.h +++ b/inc/VEffectiveAreaCalculator.h @@ -230,7 +230,6 @@ class VEffectiveAreaCalculator double fWoff; double fSpectralIndex; int fTNoise; - double fTNoisePE; double fTPedvar; int nbins; double e0[1000]; diff --git a/src/VEffectiveAreaCalculator.cpp b/src/VEffectiveAreaCalculator.cpp index 84705d00..cbfa17d5 100644 --- a/src/VEffectiveAreaCalculator.cpp +++ b/src/VEffectiveAreaCalculator.cpp @@ -372,7 +372,6 @@ VEffectiveAreaCalculator::VEffectiveAreaCalculator( VInstrumentResponseFunctionR fEffArea->Branch( "Yoff", &fYoff, "Yoff/D" ); fEffArea->Branch( "Woff", &fWoff, "Woff/D" ); fEffArea->Branch( "noise", &fTNoise, "noise/I" ); - fEffArea->Branch( "noisePE", &fTNoisePE, "noisePE/D" ); fEffArea->Branch( "pedvar", &fTPedvar, "pedvar/D" ); fEffArea->Branch( "index", &fSpectralIndex, "index/D" ); // @@ -1839,7 +1838,6 @@ void VEffectiveAreaCalculator::reset() fCuts = 0; fTNoise = 0; - fTNoisePE = 0.; fTPedvar = 0.; fAzBin = 0; @@ -2553,8 +2551,6 @@ bool VEffectiveAreaCalculator::fill( TH1D* hE0mc, CData* d, ze = fZe[ize]; fTNoise = fNoise[ize]; - // WARNING: hardwired values - not used to my knowledge anywhere? (GM) - fTNoisePE = ( double )( fNoise[ize] ) / 0.15 * 1.e9; fTPedvar = fPedVar[ize]; fXoff = fXWobble[ize]; fYoff = fYWobble[ize]; From e6ab39b45600a4e046cbb9f759e0081951d31ef7 Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Thu, 31 Oct 2024 13:43:31 +0100 Subject: [PATCH 2/5] remove noise pe --- inc/CEffArea.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/inc/CEffArea.h b/inc/CEffArea.h index 5d6e0c24..00c6a322 100644 --- a/inc/CEffArea.h +++ b/inc/CEffArea.h @@ -31,7 +31,6 @@ class CEffArea : public TObject Double_t Yoff; Double_t Woff; Int_t noise; - Double_t noisePE; Double_t pedvar; Double_t index; Int_t nbins; @@ -83,7 +82,6 @@ class CEffArea : public TObject TBranch* b_Yoff; //! TBranch* b_Woff; //! TBranch* b_noise; //! - TBranch* b_noisePE; //! TBranch* b_pedvar; //! TBranch* b_index; //! TBranch* b_nbins; //! @@ -273,14 +271,6 @@ void CEffArea::Init( TTree* tree ) } fChain->SetBranchAddress( "Woff", &Woff, &b_Woff ); fChain->SetBranchAddress( "noise", &noise, &b_noise ); - if( fChain->GetBranchStatus( "noisePE" ) ) - { - fChain->SetBranchAddress( "noisePE", &noisePE, &b_noisePE ); - } - else - { - noisePE = 0.; - } fChain->SetBranchAddress( "pedvar", &pedvar, &b_pedvar ); if( fChain->GetBranchStatus( "index" ) ) { From 875cd885f46f7eea05cf327ff7c7d23b3da7e432 Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Fri, 1 Nov 2024 07:54:15 +0100 Subject: [PATCH 3/5] VTS-appropriate max value for eff area plotting --- src/VPlotInstrumentResponseFunction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VPlotInstrumentResponseFunction.cpp b/src/VPlotInstrumentResponseFunction.cpp index 9e855379..d2d01a90 100644 --- a/src/VPlotInstrumentResponseFunction.cpp +++ b/src/VPlotInstrumentResponseFunction.cpp @@ -29,7 +29,7 @@ void VPlotInstrumentResponseFunction::setPlottingDefaults() setPlottingAxis( "distance_Lin", "X", false, 0., 500., "distance [m]" ); setPlottingAxis( "nimages_Lin", "X", false, 0., 5., "number of images" ); - setPlottingAxis( "effarea_Lin", "Y", true, 1.0, 5.e7, "effective area [m^{2}]" ); + setPlottingAxis( "effarea_Lin", "Y", true, 1.0, 1.e6, "effective area [m^{2}]" ); setPlottingAxis( "angularesolution_Lin", "Y", false, 0., 0.35, "angular resolution [deg]" ); setPlottingAxis( "coreresolution_Lin", "Y", false, 0., 40.0, "core resolution [m]" ); setPlottingAxis( "energyresolution_Lin", "Y", false, 0., 0.40, "energy resolution" ); From 377645b5536ae77b6542a66ecbfea0050da3c18a Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Sun, 3 Nov 2024 16:32:25 +0100 Subject: [PATCH 4/5] cleanup --- inc/VTableLookupDataHandler.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/inc/VTableLookupDataHandler.h b/inc/VTableLookupDataHandler.h index af1cb1ec..74106086 100644 --- a/inc/VTableLookupDataHandler.h +++ b/inc/VTableLookupDataHandler.h @@ -272,8 +272,6 @@ class VTableLookupDataHandler double fR [VDST_MAXTELESCOPES]; //!< distance from each telescope to reconstructed shower core double fRTel [VDST_MAXTELESCOPES]; //!< distance from each telescope to reconstructed shower core double fR_telType[VDST_MAXTELESCOPES]; //!< distance from each telescope to reconstructed shower core (depending on tel type) - // double fMCR [VDST_MAXTELESCOPES]; //!< distance from each telescope to reconstructed shower core - // double fMCR_telType[VDST_MAXTELESCOPES]; //!< distance from each telescope to reconstructed shower core double fE [VDST_MAXTELESCOPES]; //!< energy assigned to each telescope (method 0) double fES [VDST_MAXTELESCOPES]; //!< energy assigned to each telescope (method 1) int fnenergyT; //!< number of images used for the energy calculation From ad900d0515d447004a9e7d02bb4d62788eb3e8bb Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Sun, 3 Nov 2024 18:20:04 +0100 Subject: [PATCH 5/5] typo --- src/trainTMVAforGammaHadronSeparation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trainTMVAforGammaHadronSeparation.cpp b/src/trainTMVAforGammaHadronSeparation.cpp index 97cf070b..90387a38 100644 --- a/src/trainTMVAforGammaHadronSeparation.cpp +++ b/src/trainTMVAforGammaHadronSeparation.cpp @@ -143,7 +143,7 @@ TTree* prepareSelectedEventsTree( VTMVARunData* iRun, TCut iCut, if( elist && elist->GetN() > 0 ) { // select a random subsample - // require trainging and testing sample + // require training and testing sample // (add factor 10 to make sure that there are plenty // of testing events) double i_event_selected = ( double )iRun->fnTrain_Background;