From adac4f20733f5933e240f2712d03eefcc59a6f57 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 12 Sep 2025 11:17:00 -0400 Subject: [PATCH 1/5] increase ccdb logging level --- .../detector/calib/utils/DatabaseConstantProvider.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java index 3dcb8316f1..7919feaed2 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java @@ -142,10 +142,7 @@ private void initialize(String address){ provider = CCDB.createProvider(address); - LOGGER.log(Level.FINE, "[DB] ---> open connection with : {0}", address); - LOGGER.log(Level.FINE, "[DB] ---> database variation : {0}", this.variation); - LOGGER.log(Level.FINE, "[DB] ---> database run number : {0}", this.runNumber); - LOGGER.log(Level.FINE, "[DB] ---> database time stamp : {0}", databaseDate); + LOGGER.log(Level.INFO, String.format("[DB] ---> open %sd | %s | %s | %s", address, variation, runNumber, databaseDate)); provider.connect(); @@ -277,8 +274,8 @@ public void loadTable(String table_name){ int ncolumns = asgmt.getColumnCount(); Vector typecolumn = asgmt.getTypeTable().getColumns(); - LOGGER.log(Level.FINE, "[DB LOAD] ---> loading data table : {0}", table_name); - LOGGER.log(Level.FINE, "[DB LOAD] ---> number of columns : {0}", typecolumn.size()); + LOGGER.log(Level.INFO, "[DB LOAD] ---> loading : {0}", table_name); + LOGGER.log(Level.FINE, "[DB LOAD] ---> columns : {0}", typecolumn.size()); for(int loop = 0; loop < ncolumns; loop++){ String name = typecolumn.get(loop).getName(); Vector row = asgmt.getColumnValuesString(name); From 69ddfeb95656a503cfa422acadd459c38f9ba263 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 12 Sep 2025 11:25:17 -0400 Subject: [PATCH 2/5] print (long) address last --- .../org/jlab/detector/calib/utils/DatabaseConstantProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java index 7919feaed2..3e2be836a4 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java @@ -142,7 +142,7 @@ private void initialize(String address){ provider = CCDB.createProvider(address); - LOGGER.log(Level.INFO, String.format("[DB] ---> open %sd | %s | %s | %s", address, variation, runNumber, databaseDate)); + LOGGER.log(Level.INFO, String.format("[DB] ---> open %s | %s | %s | %s", runNumber, variation, databaseDate, address)); provider.connect(); From fded943f0b4f1e32ee6a7ef2f51a5beaf6ecd6ec Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 12 Sep 2025 13:55:37 -0400 Subject: [PATCH 3/5] use builtin -l logging option --- .../src/main/java/org/jlab/clas/reco/EngineProcessor.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/EngineProcessor.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/EngineProcessor.java index f3c3b6f03b..71c9a8d1ea 100644 --- a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/EngineProcessor.java +++ b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/EngineProcessor.java @@ -358,7 +358,6 @@ public static void main(String[] args){ parser.addOption("-n","-1","number of events to process"); parser.addOption("-y","0","yaml file"); parser.addOption("-u","true","update dictionary from writer ? "); - parser.addOption("-d","1","Debug level [0 - OFF, 1 - ON/default]"); parser.addOption("-S",null,"schema directory"); parser.addOption("-B",null,"background file"); parser.addOption("-P",null,"preload file for post-processing"); @@ -367,9 +366,6 @@ public static void main(String[] args){ parser.parse(args); - if(parser.getOption("-d").intValue() == 0) DefaultLogger.initialize(); - else DefaultLogger.debug(); - List services = parser.getInputList(); String inputFile = parser.getOption("-i").stringValue(); From 8a4a9d693082e5ff63a4352bf00afcd45d4e8beb Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 12 Sep 2025 13:56:10 -0400 Subject: [PATCH 4/5] remove inappropriate logging config --- .../main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 28e5782faf..85ba18104d 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -14,7 +14,6 @@ import org.jlab.geom.prim.Line3D; import org.jlab.geom.prim.Point3D; import org.jlab.geom.prim.Trap3D; -import org.jlab.logging.DefaultLogger; /** * @@ -680,7 +679,6 @@ public DCGeant4Factory(ConstantProvider provider, FeedthroughsStatus feedthroughsStatus, boolean endplatesStatus, double[][] shifts) { - DefaultLogger.debug(); dbref = DCdatabase.getInstance(); dbref.setMinistaggerType(ministaggerStatus); dbref.setFeedthroughsStatus(feedthroughsStatus); From 2d21ba474907353c7ff912ed06d42733a297744c Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 12 Sep 2025 14:04:24 -0400 Subject: [PATCH 5/5] remove newly unused dependencies --- common-tools/clas-jcsg/pom.xml | 5 ----- common-tools/clas-reco/pom.xml | 6 ------ 2 files changed, 11 deletions(-) diff --git a/common-tools/clas-jcsg/pom.xml b/common-tools/clas-jcsg/pom.xml index 0f2fb56f70..8e6385f083 100644 --- a/common-tools/clas-jcsg/pom.xml +++ b/common-tools/clas-jcsg/pom.xml @@ -39,11 +39,6 @@ clas-detector 13.2.0-SNAPSHOT - - org.jlab.clas - clas-logging - 13.2.0-SNAPSHOT - org.jlab.clas clas-utils diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml index b115c18acc..2f9df6b5fc 100644 --- a/common-tools/clas-reco/pom.xml +++ b/common-tools/clas-reco/pom.xml @@ -66,12 +66,6 @@ 13.2.0-SNAPSHOT - - org.jlab.clas - clas-logging - 13.2.0-SNAPSHOT - - org.jlab.clas clas-physics