diff -u -r1.5 -r1.6
--- DRFunctionFactory.java	7 May 2010 21:05:04 -0000	1.5
+++ DRFunctionFactory.java	8 May 2010 13:51:17 -0000	1.6
@@ -71,20 +71,39 @@

         al = new ArrayList<IFunction>();
         dualcor = new DetectorConfiguration("ccal02", "BGO", 7.13, 1.65, "Digis", 0.02, 0.02, "BGSP_BERT");
         Corfu = functionFactory.createFunctionByName("ccal02_digis_QGSP_BERT", "p4");

-        Corfu.setParameter("p0", 0.51470);
-        Corfu.setParameter("p1", 0.48233);
-        Corfu.setParameter("p2", -0.57546);
-        Corfu.setParameter("p3", 0.53035);
-        Corfu.setParameter("p4", 0.030363);

+        Corfu.setParameter("p0", 0.55381);
+        Corfu.setParameter("p1", 0.56223);
+        Corfu.setParameter("p2", -0.53302);
+        Corfu.setParameter("p3", 0.49575);
+        Corfu.setParameter("p4", -0.089947);

         al.add(Corfu);
         // adding or set elements in Map by put method key and value pair
         Cerfu = functionFactory.createFunctionByName("cc_ccal02_digis_QGSP_BERT", "p1");

-        Cerfu.setParameter("p0", 7.1940e-3);
-        Cerfu.setParameter("p1", 7620.7);

+        Cerfu.setParameter("p0", 8.9320e-3);
+        Cerfu.setParameter("p1", 7636.1);

         al.add(Cerfu);
         efu = functionFactory.createFunctionByName("ec_ccal02_digis_QGSP_BERT", "p1");

-        efu.setParameter("p0", 7.2194e-3);
-        efu.setParameter("p1", 1.0047);

+        efu.setParameter("p0", 8.1790e-3);
+        efu.setParameter("p1", 1.0041);
+        al.add(efu);
+        mp.put(dualcor, al);
+        al = new ArrayList<IFunction>();
+        dualcor = new DetectorConfiguration("ccal02", "BGO", 7.13, 1.65, "Digis", 0.02, 0.02, "BGSP_BERT_bgobirk");
+        Corfu = functionFactory.createFunctionByName("ccal02_digis_QGSP_BERT_bgobirk", "p4");
+        Corfu.setParameter("p0", 0.55381);
+        Corfu.setParameter("p1", 0.56223);
+        Corfu.setParameter("p2", -0.53302);
+        Corfu.setParameter("p3", 0.49575);
+        Corfu.setParameter("p4", -0.089947);
+        al.add(Corfu);
+        // adding or set elements in Map by put method key and value pair
+        Cerfu = functionFactory.createFunctionByName("cc_ccal02_digis_QGSP_BERT_bgobirk", "p1");
+        Cerfu.setParameter("p0", 8.9230e-3);
+        Cerfu.setParameter("p1", 7635.5);
+        al.add(Cerfu);
+        efu = functionFactory.createFunctionByName("ec_ccal02_digis_QGSP_BERT_bgobirk", "p1");
+        efu.setParameter("p0", 7.7757e-3);
+        efu.setParameter("p1", 1.0118);

         al.add(efu);
         mp.put(dualcor, al);
         al = new ArrayList<IFunction>();

@@ -117,20 +136,20 @@

         al.add(efu);
         mp.put(dualcor, al);
         al = new ArrayList<IFunction>();

-        dualcor = new DetectorConfiguration("ccal02", "BGO", 15., 2.15, "Digis", 0.02, 0.02, "BGSP_BERT");
-        Corfu = functionFactory.createFunctionByName("ccal02_digis_LCPhys_d15_215", "p4");
-        Corfu.setParameter("p0", 0.57877);
-        Corfu.setParameter("p1", 0.54309);
-        Corfu.setParameter("p2", -0.57078);
-        Corfu.setParameter("p3", 0.46416);
-        Corfu.setParameter("p4", -0.10309);

+        dualcor = new DetectorConfiguration("ccal02", "BGO", 15., 2.15, "Digis", 0.02, 0.02, "QGSP_BERT");
+        Corfu = functionFactory.createFunctionByName("ccal02_digis_BGSP_BERT_d15_215", "p4");
+        Corfu.setParameter("p0", 0.59349);
+        Corfu.setParameter("p1", 0.61859);
+        Corfu.setParameter("p2", -0.51035);
+        Corfu.setParameter("p3", 0.46579);
+        Corfu.setParameter("p4", -0.17369);

         al.add(Corfu);
         // adding or set elements in Map by put method key and value pair

-        Cerfu = functionFactory.createFunctionByName("cc_ccal02_digis_LCPhys_d15_215", "p1");

+        Cerfu = functionFactory.createFunctionByName("cc_ccal02_digis_QGSP_BERT_d15_215", "p1");

         Cerfu.setParameter("p0", 5.8230e-3);
         Cerfu.setParameter("p1", 12653.);
         al.add(Cerfu);

-        efu = functionFactory.createFunctionByName("ec_ccal02_digis_LCPhys_d15_215", "p1");

+        efu = functionFactory.createFunctionByName("ec_ccal02_digis_QGSP_BERTLCPhys_d15_215", "p1");

         efu.setParameter("p0", 1.7141e-3);
         efu.setParameter("p1", 1.0025);
         al.add(efu);