LISTSERV mailing list manager LISTSERV 16.5

Help for HPS-SVN Archives


HPS-SVN Archives

HPS-SVN Archives


HPS-SVN@LISTSERV.SLAC.STANFORD.EDU


View:

Message:

[

First

|

Previous

|

Next

|

Last

]

By Topic:

[

First

|

Previous

|

Next

|

Last

]

By Author:

[

First

|

Previous

|

Next

|

Last

]

Font:

Proportional Font

LISTSERV Archives

LISTSERV Archives

HPS-SVN Home

HPS-SVN Home

HPS-SVN  February 2015

HPS-SVN February 2015

Subject:

r2219 - /java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/triggerbank/TriggerConfig.java

From:

[log in to unmask]

Reply-To:

Notification of commits to the hps svn repository <[log in to unmask]>

Date:

Sat, 28 Feb 2015 13:22:55 -0000

Content-Type:

text/plain

Parts/Attachments:

Parts/Attachments

text/plain (96 lines)

Author: [log in to unmask]
Date: Sat Feb 28 05:22:50 2015
New Revision: 2219

Log:
minor update for TriggerConfig class

Modified:
    java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/triggerbank/TriggerConfig.java

Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/triggerbank/TriggerConfig.java
 =============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/triggerbank/TriggerConfig.java	(original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/triggerbank/TriggerConfig.java	Sat Feb 28 05:22:50 2015
@@ -14,22 +14,26 @@
 
     /*
      * Read/Parse/Save the DAQ trigger configuration settings.
+     * These settings arrive in multiple banks, but they *should* be in the same event.
      *
-     * A hack in progress.
+     * Currently this is set up to read SSP and ECAL configurations,
+     * which is all that is currently available in EVIO as of Feb 28, 2015.
      * 
-     * Activate by uncommenting line 61 in LCSimEngRunEventBuilder.java
+     * GTP settings and Prescale factors will need to be added to this class when added to EVIO.
      *
      * TODO: Error in EVIO format for Crate 39 for 2014 data requires another JEVIO workaround (realized Feb 16).
+     *       ** This was fixed in EVIO for data after run 4044.
+     *       
      * TODO: Manually put in GTP settings based on run number for 2014 data.
      * TODO: Manually deal with change in format of SSP_HPS_SINGLES_NMIN (at 3312(?)).
      *
-     * TODO: This should probably be a Driver.
-     *
      * TODO: Restructure, clean up..
      *  
-     *  NAB 2015/02/16
+     *  @author <[log in to unmask]>
      */
-   
+  
+    public int nBanks=0;
+    
     public static final int BANK_TAG = 0xE10E;
   
     // need to know these in order to interpret DAQ strings:
@@ -44,7 +48,8 @@
 	public Map<EcalChannel,Float> PEDESTAL=new HashMap<EcalChannel,Float>();
 	public Map<EcalChannel,Integer> THRESHOLD=new HashMap<EcalChannel,Integer>();
 	
-	private boolean debug=false;//true;
+//	private boolean debug=true;
+	private boolean debug=false;
 
 	// FADC Config:
 	public int fadcNSA=0;
@@ -109,12 +114,15 @@
 	}
     
     public void parse(int crate,int runNumber,String[] dump) {
+        
+        nBanks++;
+        
         loadConfigMap(crate,dump); 
     	if (debug) printMap();
         fixConfigMap2014Run(runNumber);
         parseConfigMap();
-        // don't do this here, need to wait on more banks:
-        //if (debug) printVars();
+        
+        if (nBanks==3) printVars();
     }
 
     public void parseConfigMap()
@@ -285,7 +293,7 @@
 	    System.err.println(String.format("FADC250_WIDTH: %d",fadcWIDTH));
 	    System.err.println(String.format("FADC250_OFFSET: %d",fadcOFFSET));
         for (EcalChannel cc : ecalConditions.getChannelCollection()) {
-            System.err.print(String.format("SLOT%d CHAN%d --",cc.getSlot(),cc.getChannel()));
+            //System.err.print(String.format("SLOT%d CHAN%d --",cc.getSlot(),cc.getChannel()));
             if (!PEDESTAL.containsKey(cc)) {
                 System.err.println("\nP !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
             }
@@ -295,8 +303,8 @@
             if (!GAIN.containsKey(cc)) {
                 System.err.println("\nG !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
             }
-            System.err.println(String.format(" %f %d %f",
-                    PEDESTAL.get(cc),THRESHOLD.get(cc),GAIN.get(cc)));
+            //System.err.println(String.format(" %f %d %f",
+            //        PEDESTAL.get(cc),THRESHOLD.get(cc),GAIN.get(cc)));
         }
 	    System.err.println();
 	    for (int ii=0; ii<2; ii++)

Top of Message | Previous Page | Permalink

Advanced Options


Options

Log In

Log In

Get Password

Get Password


Search Archives

Search Archives


Subscribe or Unsubscribe

Subscribe or Unsubscribe


Archives

November 2017
August 2017
July 2017
January 2017
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
December 2013
November 2013

ATOM RSS1 RSS2



LISTSERV.SLAC.STANFORD.EDU

Secured by F-Secure Anti-Virus CataList Email List Search Powered by the LISTSERV Email List Manager

Privacy Notice, Security Notice and Terms of Use