|
|
[HepData-svn] r1304 - in trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp: components pages plot query
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Thu Nov 5 15:53:13 GMT 2009
Author: whalley
Date: Thu Nov 5 15:53:13 2009
New Revision: 1304
Log:
fix Plotter log <0 problem and removed print statements
Modified:
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/ReactionPlotWords.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Summary.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/WriteDsObservables.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/CombinedPlot.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Search.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ViewBase.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/plot/Plotter.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/query/ConstructQueryPaper.java
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java Thu Nov 5 14:33:45 2009 (r1303)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java Thu Nov 5 15:53:13 2009 (r1304)
@@ -78,7 +78,7 @@
if (j == i) {
if (comment.equals(ycomm)) nmatch += 1;
ycomm = comment;
- System.out.println("setting ycomm " + ycomm);
+// System.out.println("setting ycomm " + ycomm);
}
}
}
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/ReactionPlotWords.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/ReactionPlotWords.java Thu Nov 5 14:33:45 2009 (r1303)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/ReactionPlotWords.java Thu Nov 5 15:53:13 2009 (r1304)
@@ -24,7 +24,7 @@
private List <YAxis> getSelectedYAxes(){
List <YAxis> _selected = new ArrayList();
List <String> _names = _reqGlobals.getRequest().getParameterNames();
- System.out.println(_names);
+// System.out.println(_names);
int size= _names.size();
for (int i=0; i<size; i++){
if(_names.get(i).startsWith("plot")){
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Summary.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Summary.java Thu Nov 5 14:33:45 2009 (r1303)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Summary.java Thu Nov 5 15:53:13 2009 (r1304)
@@ -120,7 +120,7 @@
public String getFirstPreprint(){
int n = 0;
String _firstpreprint= "Not Known";
- System.out.println("number of references:" + getPaper().getReferences().size());
+// System.out.println("number of references:" + getPaper().getReferences().size());
for (Reference ref : getPaper().getReferences()){
String refdesc = ref.getDescription();
if(!ref.getType().equals("JOUR")){
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/WriteDsObservables.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/WriteDsObservables.java Thu Nov 5 14:33:45 2009 (r1303)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/WriteDsObservables.java Thu Nov 5 15:53:13 2009 (r1304)
@@ -32,7 +32,7 @@
@BeginRender
void renderMessage(MarkupWriter writer) {
- System.out.println("renderMessqage in writeDsObservables");
+// System.out.println("renderMessqage in writeDsObservables");
List <String> _dsobservables = new ArrayList();
List <BigInteger> _counts = new ArrayList();
@@ -44,14 +44,14 @@
String dsreaction = getQueryParam("initial") + " --> " + getQueryParam("final");
int j = dsreaction.lastIndexOf("(");
if(j>0) {dsreaction = dsreaction.substring(0,j-1);}
- System.out.println(dsreaction);
+// System.out.println(dsreaction);
String dsreactionURL = "";
dsreactionURL = dsreaction.replace(" ","_");
- System.out.println("dsreaction is " + dsreaction);
+// System.out.println("dsreaction is " + dsreaction);
try{
dsreactionURL = URLEncoder.encode(dsreactionURL,"UTF-8");
} catch (Exception ex) {dsreactionURL = "failed";};
- System.out.println("dsreactionURL is " + dsreactionURL);
+// System.out.println("dsreactionURL is " + dsreactionURL);
Query q = null;
StringBuffer b = new StringBuffer();
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/CombinedPlot.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/CombinedPlot.java Thu Nov 5 14:33:45 2009 (r1303)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/CombinedPlot.java Thu Nov 5 15:53:13 2009 (r1304)
@@ -241,7 +241,7 @@
Boolean syst = true;
if(optionstring != null){
if(OptionHasString("sys") != null){
- if(OptionHasString("sys").equals("no")){ System.out.println("setting system to false"); syst = false; }
+ if(OptionHasString("sys").equals("no")){ syst = false; }
}
}
series1 = getDataSeries(ya,Integer.parseInt(getXId()),getXscale(),getYscale(),_sf,syst);
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Search.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Search.java Thu Nov 5 14:33:45 2009 (r1303)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Search.java Thu Nov 5 15:53:13 2009 (r1304)
@@ -72,7 +72,7 @@
return getSearchString();
}
public void onActivate(String q) {
- System.out.println("activating searchString");
+// System.out.println("activating searchString");
try{
q = URLDecoder.decode(q,"UTF-8");
} catch(Exception ex){}
@@ -80,7 +80,7 @@
// setSearchString(q);
}
public void onActivate(EventContext context) {
- System.out.println("activating context");
+// System.out.println("activating context");
parseContext(context);
}
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ViewBase.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ViewBase.java Thu Nov 5 14:33:45 2009 (r1303)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ViewBase.java Thu Nov 5 15:53:13 2009 (r1304)
@@ -113,7 +113,7 @@
}
m = Pattern.compile("\\A" + "d" + "([\\d,-]+)\\Z").matcher(ps);
if (m.matches()) {
- System.out.println("Matching dataset string with " + m.group(1) );
+// System.out.println("Matching dataset string with " + m.group(1) );
_params.put("ds", m.group(1));
continue;
}
@@ -334,7 +334,7 @@
// Integer dsmax = getMaxDsId();
Integer dsmin = getCounter();
Integer dsmax = getCounter() + getLength() - 1;
- System.out.println("outputting datasets " + dsmin + " to " + dsmax);
+// System.out.println("outputting datasets " + dsmin + " to " + dsmax);
if(dsmin == null && dsmax == null){
} else if (dsmax == null){
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/plot/Plotter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/plot/Plotter.java Thu Nov 5 14:33:45 2009 (r1303)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/plot/Plotter.java Thu Nov 5 15:53:13 2009 (r1304)
@@ -143,8 +143,11 @@
Double xhigh = x + dxplus;
// Check log ranges before adding to the data series
- boolean rangeok = !((xscale.equals("log") && xlow <= 0.0) || (yscale.equals("log") && ylow <= 0.0));
- if (rangeok) series.add(x, xlow, xhigh, y, ylow, yhigh);
+ System.out.println("xscale is " + xscale + " xlow is " + xlow + " yscale is " + yscale + "ylow is " + ylow);
+// boolean rangeok = !((xscale.equals("LOG") && xlow <= 0.0) || (yscale.equals("LOG") && ylow <= 0.0));
+ boolean rangeok = !((xscale == AxisType.LOG && xlow <= 0.0) || (yscale == AxisType.LOG && ylow <= 0.0));
+ System.out.println("rangeok is " + rangeok);
+ if (rangeok) series.add(x, xlow, xhigh, y, ylow, yhigh);
} catch(Exception e) {
//
}
@@ -155,7 +158,7 @@
public static ByteArrayOutputStream makeChartOStream(JFreeChart chart, ImageFormat format, int width, int height) {
- System.out.println("ByteArrayOutputStream....");
+// System.out.println("ByteArrayOutputStream....");
ByteArrayOutputStream os = new ByteArrayOutputStream();
if (format == ImageFormat.PNG) {
BufferedImage image = chart.createBufferedImage(width, height);
@@ -187,7 +190,7 @@
public static ByteArrayInputStream makeChartIStream(JFreeChart chart, ImageFormat format, int width, int height) {
- System.out.println("ByteArrayInputStream....");
+// System.out.println("ByteArrayInputStream....");
return new ByteArrayInputStream(makeChartOStream(chart, format, width, height).toByteArray());
}
@@ -195,9 +198,9 @@
public static StreamResponse makeChartStreamResponse(final JFreeChart chart, final ImageFormat format,
final int width, final int height) {
- System.out.println("background paint is" + chart.getBackgroundPaint());
- System.out.println("returning streamresponse...." + chart.getBackgroundPaint());
- System.out.println("getContentType...." + format.toString().toLowerCase());
+// System.out.println("background paint is" + chart.getBackgroundPaint());
+// System.out.println("returning streamresponse...." + chart.getBackgroundPaint());
+// System.out.println("getContentType...." + format.toString().toLowerCase());
return new StreamResponse() {
public String getContentType() {
return "image/" + format.toString().toLowerCase();
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/query/ConstructQueryPaper.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/query/ConstructQueryPaper.java Thu Nov 5 14:33:45 2009 (r1303)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/query/ConstructQueryPaper.java Thu Nov 5 15:53:13 2009 (r1304)
@@ -57,7 +57,7 @@
else if( queryString.toUpperCase().equals("JETPRODUCTIONNOTEE") ){
return JetProductionNotEE(flag,_session);
}
- System.out.println("query: " + queryString);
+// System.out.println("query: " + queryString);
//
String words[] = queryString.substring(ix+1).toUpperCase().split("\\s+AND\\s+");
@@ -73,7 +73,7 @@
String reference = null;
String date = null;
String datetype = "=";
- System.out.println(queryString);
+// System.out.println(queryString);
for (int i=0; i<words.length; i++){
String parts[] = words[i].split("\\s+");
if( parts[0].equals("RE") || parts[0].equals("REAC") || parts[0].equals("REACTION") ) {
@@ -107,7 +107,7 @@
for (int j=next+1; j<parts.length; j++){
date = date.concat(" " + parts[j]);
}
- System.out.println(datetype);
+// System.out.println(datetype);
}
if(parts[0].equals("FSP")){
if(parts[1].equals("HADRONS")){parts[1] = "2HADRON";}
@@ -148,7 +148,7 @@
return Physics(experiment,date,datetype,reaction,observable,sqrts,flag,_session);
}
else{
- System.out.println("calling ExperimentDate" + experiment + date);
+// System.out.println("calling ExperimentDate" + experiment + date);
return ExperimentDate(experiment,date,datetype,flag,_session);
}
}
@@ -167,7 +167,7 @@
return Physics(experiment,date,datetype,reaction,observable,sqrts,flag,_session);
}
else{
- System.out.println("calling ExperimentDate" + experiment + date);
+// System.out.println("calling ExperimentDate" + experiment + date);
return ExperimentDate(experiment,date,datetype,flag,_session);
}
}
@@ -210,11 +210,11 @@
else{
q = _session.createSQLQuery(b.toString()).addEntity("p",Paper.class);
}
- System.out.println(q.toString());
+// System.out.println(q.toString());
return q;
}
public static Query EventShapesEE(String flag,org.hibernate.Session _session){
- System.out.println("using Special");
+// System.out.println("using Special");
Query q=null;
StringBuffer b = new StringBuffer();
@@ -244,11 +244,11 @@
else{
q = _session.createSQLQuery(b.toString()).addEntity("p",Paper.class);
}
- System.out.println(q.toString());
+// System.out.println(q.toString());
return q;
}
public static Query EventShapesNotEE(String flag,org.hibernate.Session _session){
- System.out.println("using Special");
+// System.out.println("using Special");
Query q=null;
StringBuffer b = new StringBuffer();
@@ -278,11 +278,11 @@
else{
q = _session.createSQLQuery(b.toString()).addEntity("p",Paper.class);
}
- System.out.println(q.toString());
+// System.out.println(q.toString());
return q;
}
public static Query JetProduction(String flag,org.hibernate.Session _session){
- System.out.println("using Special");
+// System.out.println("using Special");
Query q=null;
StringBuffer b = new StringBuffer();
@@ -311,11 +311,11 @@
else{
q = _session.createSQLQuery(b.toString()).addEntity("p",Paper.class);
}
- System.out.println(q.toString());
+// System.out.println(q.toString());
return q;
}
public static Query JetProductionEE(String flag,org.hibernate.Session _session){
- System.out.println("using Special");
+// System.out.println("using Special");
Query q=null;
StringBuffer b = new StringBuffer();
@@ -348,11 +348,11 @@
else{
q = _session.createSQLQuery(b.toString()).addEntity("p",Paper.class);
}
- System.out.println(q.toString());
+// System.out.println(q.toString());
return q;
}
public static Query JetProductionNotEE(String flag,org.hibernate.Session _session){
- System.out.println("using Special");
+// System.out.println("using Special");
Query q=null;
StringBuffer b = new StringBuffer();
@@ -385,12 +385,12 @@
else{
q = _session.createSQLQuery(b.toString()).addEntity("p",Paper.class);
}
- System.out.println(q.toString());
+// System.out.println(q.toString());
return q;
}
////// query constructor fordsreaction (from easy search) only///
public static Query DsReaction(String dsreaction,String dsobservable,String flag,org.hibernate.Session _session){
- System.out.println("using dsreaction from easysearch");
+// System.out.println("using dsreaction from easysearch");
String theDsReaction=dsreaction;
String theDsObservable=dsobservable;
Query q=null;
@@ -424,12 +424,12 @@
else{
q = _session.createSQLQuery(b.toString()).addEntity("p",Paper.class);
}
- System.out.println(q.toString());
+// System.out.println(q.toString());
return q;
}
////// query constructor for experiments only///
public static Query Experiment(String experiment,String flag,org.hibernate.Session _session){
- System.out.println("using Experiment");
+// System.out.println("using Experiment");
String theExp=experiment;
Query q=null;
StringBuffer b = new StringBuffer();
@@ -449,14 +449,14 @@
b.append("%')");
b.append(" order by p._spiresId desc");
q = _session.createQuery(b.toString());
- System.out.println(q.toString());
+// System.out.println(q.toString());
// q.setString("exp",theExp);
return q;
}
////// query constructor for Experiment and date ///
public static Query ExperimentDate(String experiment,String date,String datetype,String flag,org.hibernate.Session _session){
- System.out.println("using ExperimentDate");
+// System.out.println("using ExperimentDate");
String theDate=date;
String theExp=experiment;
Query q=null;
@@ -490,14 +490,14 @@
b.append(" order by p._spiresId desc");
q = _session.createQuery(b.toString());
- System.out.println(q.toString());
+// System.out.println(q.toString());
// q.setString("date",theDate);
return q;
}
////// query constructor for references only///
public static Query Reference(String reference,String flag, org.hibernate.Session _session){
- System.out.println("using Reference");
+// System.out.println("using Reference");
String theRef=reference;
Query q=null;
StringBuffer b = new StringBuffer();
@@ -520,7 +520,7 @@
}
////// query constructor for date only///
public static Query Date(String date,String datetype,String flag, org.hibernate.Session _session){
- System.out.println("using Date");
+// System.out.println("using Date");
String theDate=date;
Query q=null;
StringBuffer b = new StringBuffer();
@@ -550,7 +550,7 @@
}
////// query constructor for IRN only///
public static Query SpiresId(String spiresid,String flag, org.hibernate.Session _session){
- System.out.println("using SpiresId");
+// System.out.println("using SpiresId");
String theIrn=spiresid;
Query q=null;
StringBuffer b = new StringBuffer();
@@ -571,7 +571,7 @@
}
////// query constructor for red only///
public static Query RedId(String redid,String flag, org.hibernate.Session _session){
- System.out.println("using RedId");
+// System.out.println("using RedId");
Query q=null;
StringBuffer b = new StringBuffer();
@@ -615,15 +615,15 @@
/////////////// now the query constructer for Papers /////////////////
public static Query Physics(String experiment, String date, String datetype, String reaction, String observable, String sqrts, String flag, org.hibernate.Session _session){
- System.out.println("using Physics");
+// System.out.println("using Physics");
List <String> isp = new ArrayList();
List <String> fsp = new ArrayList();
List <String> mfsp = new ArrayList();
List <String> misp = new ArrayList();
- System.out.println("Here we are in Papers");
- System.out.println("sorting reaction: " + reaction);
+// System.out.println("Here we are in Papers");
+// System.out.println("sorting reaction: " + reaction);
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
if( reaction != null && !reaction.equals("") && !reaction.equals("null")) {
////> here we have a reaction
@@ -692,8 +692,8 @@
if ( observable != null && !observable.equals("") && !observable.equals("null") ) { theObs = observable; }
String theSqrtsLo = "";
- System.out.println("sqrts is: " + sqrts);
- if ( sqrts != null && !sqrts.equals("") && !sqrts.equals("null")) { theSqrtsLo = sqrts; System.out.println(sqrts); }
+// System.out.println("sqrts is: " + sqrts);
+ if ( sqrts != null && !sqrts.equals("") && !sqrts.equals("null")) { theSqrtsLo = sqrts; }
Query q = null;
@@ -702,9 +702,9 @@
if(isp.size() > 0){
//select...
- System.out.println("we have an intial state " + isp + "/" + misp);
- System.out.println("and final state " + fsp + "/" + mfsp );
- System.out.println("and observable " + observable);
+// System.out.println("we have an intial state " + isp + "/" + misp);
+// System.out.println("and final state " + fsp + "/" + mfsp );
+// System.out.println("and observable " + observable);
if (flag.equals("count")){
b.append("select count(distinct pbeam) from Paper pbeam");
}
@@ -958,7 +958,7 @@
q = _session.createQuery(b.toString());
}
- System.out.println(q.toString());
+// System.out.println(q.toString());
return q;
}
More information about the HepData-svn
mailing list
|