refactor: more renamings

src/main/java/org/jlab/clas/timeline/histograms/FTOFandDC.java -> src/main/java/org/jlab/clas/timeline/histograms/DCandFTOF.java
src/main/java/org/jlab/clas/timeline/histograms/monitor2p2GeV.java -> src/main/java/org/jlab/clas/timeline/histograms/GeneralMon.java

Author: c-dilks

…/clas/timeline/histograms/FTOFandDC.java …/clas/timeline/histograms/DCandFTOF.javasrc/main/java/org/jlab/clas/timeline/histograms/FTOFandDC.java renamed to src/main/java/org/jlab/clas/timeline/histograms/DCandFTOF.java src/main/java/org/jlab/clas/timeline/histograms/FTOFandDC.java renamed to src/main/java/org/jlab/clas/timeline/histograms/DCandFTOF.java

@@ -13,7 +13,7 @@
 import org.jlab.utils.groups.IndexedTable;
 import org.jlab.detector.calib.utils.ConstantsManager;
 
-public class FTOFandDC {
+public class DCandFTOF {
   boolean userTimeBased;
   public int runNum;
   public String outputDir;
@@ -55,7 +55,7 @@ public class FTOFandDC {
   public IndexedTable ftofTable, ctofTable;
   public ConstantsManager ccdb;
 
-  public FTOFandDC(int reqrunNum, String reqOutputDir, boolean reqTimeBased) {
+  public DCandFTOF(int reqrunNum, String reqOutputDir, boolean reqTimeBased) {
     runNum = reqrunNum;userTimeBased=reqTimeBased;
     outputDir = reqOutputDir;
 

…s/timeline/histograms/monitor2p2GeV.java …clas/timeline/histograms/GeneralMon.javasrc/main/java/org/jlab/clas/timeline/histograms/monitor2p2GeV.java renamed to src/main/java/org/jlab/clas/timeline/histograms/GeneralMon.java src/main/java/org/jlab/clas/timeline/histograms/monitor2p2GeV.java renamed to src/main/java/org/jlab/clas/timeline/histograms/GeneralMon.java

@@ -12,7 +12,10 @@
 import org.jlab.utils.groups.IndexedTable;
 import org.jlab.detector.calib.utils.ConstantsManager;
 
-public class monitor2p2GeV {
+/**
+ * General Monitoring histograms (a.k.a. General Monolith)
+ */
+public class GeneralMon {
 
   /**
    * Assume 1+6 bit groupings, one for each bit in the given
@@ -208,7 +211,7 @@ boolean testTriggerSector(int sector) {
   public IndexedTable rfTable, rfTableOffset;
   public ConstantsManager ccdb;
 
-  public monitor2p2GeV(int reqrunNum, String reqOutputDir, float reqEB, boolean reqTimeBased) {
+  public GeneralMon(int reqrunNum, String reqOutputDir, float reqEB, boolean reqTimeBased) {
 
     runNum = reqrunNum;EB=reqEB;userTimeBased=reqTimeBased;
     outputDir = reqOutputDir;

src/main/java/org/jlab/clas/timeline/run_histograms.java

@@ -32,17 +32,17 @@ public static void main(String[] args) {
     System.out.println("will process run number "+runNum+" from list "+filelist+" looking for up to "+maxevents+" events, beam energy setting "+EB);
 
     //// instantiate histogramming classes
-    monitor2p2GeV ana_mon     = new monitor2p2GeV(runNum,outputDir,EB,useTB);
-    FTOFandDC     ana_ftof_dc = new FTOFandDC(runNum,outputDir,useTB);
-    CTOF          ana_ctof    = new CTOF(runNum,outputDir,useTB);
-    HTCC          ana_htc     = new HTCC(runNum,outputDir);
-    LTCC          ana_ltc     = new LTCC(runNum,outputDir,EB,useTB);
-    RICH          ana_rich    = new RICH(runNum,outputDir,EB,useTB);
-    CND           ana_cnd     = new CND(runNum,outputDir,useTB);
-    FT            ana_ft      = new FT(runNum,outputDir,useTB);
-    BAND          ana_band    = new BAND(runNum,outputDir,EB,useTB);
-    helicity      helicity    = new helicity();
-    trigger       trigger     = new trigger();
+    GeneralMon ana_mon     = new GeneralMon(runNum,outputDir,EB,useTB);
+    DCandFTOF  ana_dc_ftof = new DCandFTOF(runNum,outputDir,useTB);
+    CTOF       ana_ctof    = new CTOF(runNum,outputDir,useTB);
+    HTCC       ana_htc     = new HTCC(runNum,outputDir);
+    LTCC       ana_ltc     = new LTCC(runNum,outputDir,EB,useTB);
+    RICH       ana_rich    = new RICH(runNum,outputDir,EB,useTB);
+    CND        ana_cnd     = new CND(runNum,outputDir,useTB);
+    FT         ana_ft      = new FT(runNum,outputDir,useTB);
+    BAND       ana_band    = new BAND(runNum,outputDir,EB,useTB);
+    helicity   helicity    = new helicity();
+    trigger    trigger     = new trigger();
 
     List<String> toProcessFileNames = new ArrayList<String>();
     File file = new File(filelist);
@@ -82,7 +82,7 @@ public static void main(String[] args) {
         //// call each histogramming class instance's `processEvent`
         ana_mon.processEvent(event);
         ana_ctof.processEvent(event);
-        ana_ftof_dc.processEvent(event);
+        ana_dc_ftof.processEvent(event);
         ana_htc.processEvent(event);
         ana_ltc.processEvent(event);
         ana_cnd.processEvent(event);
@@ -111,7 +111,7 @@ public static void main(String[] args) {
     //// call each histogramming class instance's `write`
     ana_mon.write();
     ana_ctof.write();
-    ana_ftof_dc.write();
+    ana_dc_ftof.write();
     ana_htc.write();
     ana_ltc.write();
     ana_cnd.write();