Merge pull request #296 from VERITAS-Observatory/492-dev6

v492 dev6 - minor updates.

Author: GernotMaier

.pre-commit-config.yaml

@@ -1,18 +1,18 @@
 repos:
   # https://pycqa.github.io/isort/docs/configuration/black_compatibility.html#integration-with-pre-commit
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
         args: ["--profile", "black", "--filter-files"]
   - repo: https://github.com/psf/black
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
       - id: black
         args: ["--line-length=100"]
   # https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html?highlight=other%20tools#flake8
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+    rev: 7.2.0
     hooks:
       - id: flake8
         args: ["--max-line-length=100", "--extend-ignore=E203,E712"]
@@ -31,7 +31,7 @@ repos:
   #    - id: actionlint
   # codespell
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         args: [

README.md

@@ -1,6 +1,7 @@
 # Eventdisplay: An Analysis and Reconstruction Package for VERITAS
 
 [![DOI](https://zenodo.org/badge/221041866.svg)](https://zenodo.org/badge/latestdoi/221041866)
+[![ASCL](https://img.shields.io/badge/ascl-2212.002-blue.svg?colorB=262255)](https://ascl.net/2212.002)
 [![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 [![CI](https://github.com/VERITAS-Observatory/EventDisplay_v4/actions/workflows/ci.yml/badge.svg)](https://github.com/VERITAS-Observatory/EventDisplay_v4/actions/workflows/ci.yml)
 

src/VAnaSum.cpp

@@ -568,9 +568,9 @@ void VAnaSum::doStereoAnalysis( int icounter, int onrun, int offrun, TDirectory*
     fstereo_onoff->doOnOffforSkyHistograms( fStereoOn->getSkyHistograms( true ), fStereoOff->getSkyHistograms( true ), fStereoOff->getAlphaNormUC() );
 
     // print out maximum in maps
-    cout << "\t Maximum in CORRELATED maps: " << endl;
+    cout << "\t Maximum in CORRELATED maps:" << endl;
     TH2D* hStSig = ( TH2D* )fstereo_onoff->do2DSignificance( fStereoOn->getStereoSkyMap(), fStereoOff->getStereoSkyMap(), fStereoOff->getAlphaNorm() );
-    cout << "\t Maximum in UNCORRELATED maps: " << endl;
+    cout << "\t Maximum in UNCORRELATED maps:" << endl;
     TH2D* hStSigUC = ( TH2D* )fstereo_onoff->do2DSignificance( fStereoOn->getStereoSkyMapUC(), fStereoOff->getStereoSkyMapUC(), fStereoOff->getAlphaNormUC() );
 
     ////////////////////////////////////////////////////////////
@@ -595,9 +595,9 @@ void VAnaSum::doStereoAnalysis( int icounter, int onrun, int offrun, TDirectory*
     }
 
     cout << endl;
-    cout << "\t ---------------------------- " << endl;
-    cout << "\t RESULTS FOR SOURCE POSITION: " << endl;
-    cout << "\t ---------------------------- " << endl;
+    cout << "\t ----------------------------" << endl;
+    cout << "\t RESULTS FOR SOURCE POSITION:" << endl;
+    cout << "\t ----------------------------" << endl;
     cout << "\t ON:" << i_nevts_on << "  OFF:" << setprecision( 4 ) << i_nevts_off* i_norm_alpha << " (";
     cout << "off " << i_nevts_off << ", alpha=" << i_norm_alpha << ")" << endl;
     cout << "\t " << setprecision( 4 ) <<  i_sig << " Sigma  " << i_rate << "+/-" << i_rateE << " gammas/min" << endl;

src/VAnaSumRunParameter.cpp

@@ -696,7 +696,7 @@ int VAnaSumRunParameter::readRunParameter( string i_filename )
     }
     is.close();
     cout << "========================================================" << endl;
-    cout << "        end reading run parameters                      " << endl;
+    cout << "        end reading run parameters" << endl;
     cout << "========================================================" << endl;
     cout << endl;
 

src/VEvndispRunParameter.cpp

@@ -759,7 +759,8 @@ void VEvndispRunParameter::print( int iEv )
                 cout << "\t trace integration method: \t" << fTraceIntegrationMethod[fTelToAnalyze[i]];
                 if( fDoublePass )
                 {
-                    cout << "\t (doublepass, integration method pass 1: " << fTraceIntegrationMethod_pass1[fTelToAnalyze[i]] << ")";
+                    cout << "\t (doublepass, integration method pass 1: " << fTraceIntegrationMethod_pass1[fTelToAnalyze[i]] << ", ";
+                    cout << "\t max LG/HG time difference: " << fSumWindowMaxTimeDifferenceLGtoHG[fTelToAnalyze[i]] << ")";
                 }
                 cout << endl;
                 cout << "\t start of summation window: \t" << fsumfirst[fTelToAnalyze[i]];

src/VExposure.cpp

@@ -2438,8 +2438,8 @@ void VExposure::downloadRunList()
 
     char* ENVIR_VAR;
 
-    char mkdir_string[800];
-    char permision_string[800];
+    char mkdir_string[1800];
+    char permision_string[1800];
 
     ENVIR_VAR = getenv( "VERITAS_DATA_DIR" );
 

src/VImageBaseAnalyzer.cpp

@@ -1377,10 +1377,14 @@ void VImageBaseAnalyzer::calcSecondTZerosSums()
                     if( corrfirst < ( int )getNSamples() )
                     {
                         // get new tzero for sumwindow starting at corrfirst to the end of the window
-                        // assume that high and low gain timing is not more than 5 samples off
+                        // assume that high and low gain timing is not more than getSumWindowMaxTimeDifferenceLGtoHG samples off
                         if( getSumWindowMaxTimeDifferenceLGtoHG() > -998. )
                         {
                             corrfirst += getSumWindowMaxTimeDifferenceLGtoHG();
+                            if( corrfirst < 0 )
+                            {
+                                corrfirst = 0;
+                            }
                         }
                         else
                         {

src/VRunSummary.cpp

@@ -169,7 +169,7 @@ void VRunSummary::print()
     char itemp[200];
 
     cout << endl << endl;
-    cout << "RUN SUMMARY: " << endl << endl;
+    cout << "RUN SUMMARY:" << endl << endl;
 
     for( int i = 0; i < fRunSummaryTree->GetEntries(); i++ )
     {

src/VTableLookup.cpp

@@ -567,7 +567,6 @@ void VTableLookup::fillLookupTable()
                 // get telescope type
                 ULong64_t t = iter_i_list_of_Tel_type->first;
 
-                // This should be already the corrected/scaled size value for MC.
                 float* i_s = fData->getSize( t, fTLRunParameter->fUseEvndispSelectedImagesOnly );
                 float* i_r = fData->getDistanceToCore( t );
                 unsigned int i_type = fData->getNTel_type( t );

src/VTableLookupRunParameter.cpp

@@ -415,7 +415,7 @@ bool VTableLookupRunParameter::fillParameters( int argc, char* argv[] )
         }
     }
     // get telescope combinations (from first file if several files are given)
-    if( inputfile[0].find( "*" ) == string::npos )
+    if( inputfile.size() > 0 )
     {
         readTelescopeToAnalyze( inputfile[0] );
     }