Adapting to plot v2: Abstraction of graphs & new implementations: JZY3D, JavaFX, JFreeChart

ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/Acquisition.java

@@ -231,9 +231,13 @@ public class Acquisition {
 		
 		logger.fine("Map Model to internal logic");
 
-		if(smodel.getScan().getManipulation()!= null && smodel.getScan().getManipulation().size()>0){
+		if(smodel.getScan().getManipulation()!= null && smodel.getScan().getManipulation().size()>0){                        
 			// Setup optimized with manipulations
-			EventBus b = new AsyncEventBus(Executors.newCachedThreadPool());
+                        //EventBus b = new AsyncEventBus(Executors.newCachedThreadPool());
+                        EventBus b = new AsyncEventBus(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()));
+                        
+                        //EventBus b = new AsyncEventBus(Executors.newSingleThreadExecutor());
+                        
 			// Map scan to base model
 			// After this call actionLoop and collector will be initialized
 			Collector collector = new Collector(b);

ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/Manipulator.java

@@ -71,7 +71,8 @@ public class Manipulator {
 			}
 			// Need to update the metadata of the message
 			dm.setMetadata(this.metadata);
-		}
+		}                
 		bus.post(message);
+                //System.out.println(Thread.currentThread());
 	}
 }