projects/lcsim/trunk/analysis/src/main/java/org/lcsim/analysis

--- projects/lcsim/trunk/analysis/src/main/java/org/lcsim/analysis/WhizardEventFilter.java	2014-05-20 23:14:30 UTC (rev 3134)
+++ projects/lcsim/trunk/analysis/src/main/java/org/lcsim/analysis/WhizardEventFilter.java	2014-05-21 19:14:01 UTC (rev 3135)
@@ -17,45 +17,49 @@

     {
         /*
          *LOI qqbar files for Ecm=500 GeV

-        uu    11775   e-L e+R
-        uu    11776   e-R e+L

+         uu    11775   e-L e+R
+         uu    11776   e-R e+L

-        cc    11779   e-L e+R
-        cc    11780   e-R e+L

+         cc    11779   e-L e+R
+         cc    11780   e-R e+L

-        dd    11795   e-L e+R
-        dd    11796   e-R e+L

+         dd    11795   e-L e+R
+         dd    11796   e-R e+L

-        ss     11799   e-L e+R
-        ss     11800   e-R e+L

+         ss     11799   e-L e+R
+         ss     11800   e-R e+L

-        bb    11803   e-L e+R
-        bb    11804   e-R e+L

+         bb    11803   e-L e+R
+         bb    11804   e-R e+L

 
          */

-        int[] lightQQbarProcesses =
-        {
-            11775, 11776, 11779, 11780, 11795, 11796, 11799, 11800, 11803, 11804
-        };

+        int[] lightQQbarProcesses
+                = {
+                    11775, 11776, 11779, 11780, 11795, 11796, 11799, 11800, 11803, 11804
+                };

         Map<String, int[]> iparams = event.getIntegerParameters();
         int idrup = 0;

-        if (iparams.containsKey("idrup"))

+        if (iparams.containsKey("idrup")) {

             idrup = iparams.get("idrup")[0];

+        }
+        if (iparams.containsKey("_idrup")) {
+            idrup = iparams.get("_idrup")[0];
+        }

 
         Map<String, float[]> fparams = event.getFloatParameters();
         float weight = 1.0f;

-        if (fparams.containsKey("_weight"))

+        if (fparams.containsKey("_weight")) {

             weight = fparams.get("_weight")[0];

+        }

-        System.out.println("idrup= "+idrup+ " : weight= "+weight);

+        System.out.println("idrup= " + idrup + " : weight= " + weight);

         boolean skipEvent = true;

-        for (int i = 0; i < lightQQbarProcesses.length; ++i)
-        {
-            if (idrup == lightQQbarProcesses[i])

+        for (int i = 0; i < lightQQbarProcesses.length; ++i) {
+            if (idrup == lightQQbarProcesses[i]) {

                 skipEvent = false;

+            }

         }

-        if (skipEvent)
-        {

+        if (skipEvent) {

             throw new Driver.NextEventException();
         }
     }