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  October 2014

HPS-SVN October 2014

Subject:

r1314 - /java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtConditions.java

From:

[log in to unmask]

Reply-To:

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

Date:

Mon, 27 Oct 2014 18:41:39 -0000

Content-Type:

text/plain

Parts/Attachments:

Parts/Attachments

text/plain (89 lines)

Author: omoreno
Date: Mon Oct 27 11:41:37 2014
New Revision: 1314

Log:
Update to implement the abstract methods in AbstractSvtConditions.

Modified:
    java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtConditions.java

Modified: java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtConditions.java
 =============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtConditions.java	(original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtConditions.java	Mon Oct 27 11:41:37 2014
@@ -1,7 +1,9 @@
 package org.hps.conditions.svt;
 
+import org.hps.conditions.svt.SvtChannel.SvtChannelCollection;
 import org.hps.conditions.svt.SvtDaqMapping.SvtDaqMappingCollection;
 
+// TODO: Move all constants to their own class
 import static org.hps.conditions.svt.SvtChannel.MAX_NUMBER_OF_SAMPLES;
 
 /**
@@ -15,24 +17,49 @@
 public final class SvtConditions extends AbstractSvtConditions {
 
     /** SVT conditions data. */
-    private SvtDaqMappingCollection daqMap = null;
-
-    /**
+    protected SvtDaqMappingCollection daqMap = null;
+    
+    public SvtConditions(){
+    }
+    
+	/**
      * Get the {@link SvtDaqMappingCollection} associated with these conditions.
      * 
      * @return The SVT DAQ map.
      */
-    public SvtDaqMappingCollection getDaqMap() {
+    @Override
+    public SvtDaqMappingCollection getDaqMap(){
         return daqMap;
     }
 
     /**
+     * Get the {@link SvtChannelCollection} for this set of conditions.
+     * 
+     * @return The SVT channel map.
+     */
+    @Override
+    public SvtChannelCollection getChannelMap(){
+        return (SvtChannelCollection) channelMap;
+    }
+    
+	/**
      * Set the {@link SvtDaqMappingCollection} associated with these conditions.
      * 
      * @param daqMap The SVT DAQ map.
+	 * @return 
      */
-    void setDaqMap(SvtDaqMappingCollection daqMap) {
+    public void setDaqMap(SvtDaqMappingCollection daqMap) {
         this.daqMap = daqMap;
+    }
+   
+    
+    /**
+     * Set the channel map of type {@link SvtChannelCollection}.
+     * 
+     *  @param channelMap The SVT channel map.
+     */
+    public void setChannelMap(SvtChannelCollection channelMap){
+    	this.channelMap = channelMap;
     }
 
     /**
@@ -103,7 +130,7 @@
         }
         buff.append('\n');
         // Loop over channels.
-        for (SvtChannel channel : channelMap.getObjects()) {
+        for (SvtChannel channel : this.getChannelMap().getObjects()) {
 
             // Get the conditions for the channel.
             ChannelConstants constants = getChannelConstants(channel);

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