Merge pull request #278 from VERITAS-Observatory/v491-dev6

v491-dev6 - minor fixes for release candidates
VERITAS-Observatory · Nov 4, 2024 · ff4d115 · ff4d115
2 parents 9064658 + ad900d0
commit ff4d115
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 19 deletions.
diff --git 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" ) )
     {

diff --git 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/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

diff --git 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];

diff --git 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" );

diff --git 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;