Index: cards/CLICdet/CLICdet_BTag_50.tcl
===================================================================
--- cards/CLICdet/CLICdet_BTag_50.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
+++ cards/CLICdet/CLICdet_BTag_50.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
@@ -0,0 +1,81 @@
+    # efficiency formula for b-jets
+    add EfficiencyFormula {5} {0.5}
+
+    # default efficiency formula (misidentification rate)
+add EfficiencyFormula {0} {
+	(energy >= 500 )* ( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (  6e-3 )+ \
+		(energy >= 500 )* ( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (  3e-3 )+ \
+		(energy >= 500 )* ( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (  2e-3 )+ \
+		(energy >= 500 )* ( abs(eta) <=1.165 && abs(eta)>0.885  ) * (  2e-3 )+ \
+		(energy >= 500 )* ( abs(eta) <=0.885 && abs(eta)>0.655  ) * (  2e-3 )+ \
+		(energy >= 500 )* ( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (  2e-3 )+ \
+		(energy >= 500 )* ( abs(eta) <=0.455 && abs(eta)>0.27   ) * (  3e-3 )+ \
+		(energy >= 500 )* ( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (  3e-3 )+ \
+		(energy >= 500 )* ( abs(eta) <=0.09                     ) * (  3e-3 )+ \
+		(energy < 500 && energy >= 250)* ( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (  5e-3 )+ \
+		(energy < 500 && energy >= 250)* ( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (  2e-3 )+ \
+		(energy < 500 && energy >= 250)* ( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (  1e-3 )+ \
+		(energy < 500 && energy >= 250)* ( abs(eta) <=1.165 && abs(eta)>0.885  ) * (  1e-3 )+ \
+		(energy < 500 && energy >= 250)* ( abs(eta) <=0.885 && abs(eta)>0.655  ) * (  1e-3 )+ \
+		(energy < 500 && energy >= 250)* ( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (  1e-3 )+ \
+		(energy < 500 && energy >= 250)* ( abs(eta) <=0.455 && abs(eta)>0.27   ) * (  1e-3 )+ \
+		(energy < 500 && energy >= 250)* ( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (  1e-3 )+ \
+		(energy < 500 && energy >= 250)* ( abs(eta) <=0.09                     ) * (  1e-3 )+ \
+		(energy < 250 && energy >= 100)* ( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 3e-3)+ \
+		(energy < 250 && energy >= 100)* ( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 1e-3)+ \
+		(energy < 250 && energy >= 100)* ( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 9e-4)+ \
+		(energy < 250 && energy >= 100)* ( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 9e-4)+ \
+		(energy < 250 && energy >= 100)* ( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 8e-4)+ \
+		(energy < 250 && energy >= 100)* ( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 7e-4)+ \
+		(energy < 250 && energy >= 100)* ( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 7e-4)+ \
+		(energy < 250 && energy >= 100)* ( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 7e-4)+ \
+		(energy < 250 && energy >= 100)* ( abs(eta) <=0.09                     ) * ( 7e-4)+ \
+		(energy < 100 )* ( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (   2e-3 )+ \
+		(energy < 100 )* ( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (   7e-4 )+ \
+		(energy < 100 )* ( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (   5e-4 )+ \
+		(energy < 100 )* ( abs(eta) <=1.165 && abs(eta)>0.885  ) * (   4e-4 )+ \
+		(energy < 100 )* ( abs(eta) <=0.885 && abs(eta)>0.655  ) * (   3e-4 )+ \
+		(energy < 100 )* ( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (   2e-4 )+ \
+		(energy < 100 )* ( abs(eta) <=0.455 && abs(eta)>0.27   ) * (   2e-4 )+ \
+		(energy < 100 )* ( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (   2e-4 )+ \
+		(energy < 100 )* ( abs(eta) <=0.09                     ) * (   3e-4 )}
+
+    # efficiency formula for c-jets (misidentification rate)
+    add EfficiencyFormula {4} {
+		(energy >= 500 )*(abs(eta) <=2.66 && abs(eta) > 2.09  ) * (  2e-2)+ \
+			(energy >= 500 )*(abs(eta) <=2.09 && abs(eta) > 1.53  ) * (  1e-2)+ \
+			(energy >= 500 )*(abs(eta) <=1.53 && abs(eta)> 1.165  ) * (  8e-3)+ \
+			(energy >= 500 )*(abs(eta) <=1.165 && abs(eta)>0.885  ) * (  8e-3)+ \
+			(energy >= 500 )*(abs(eta) <=0.885 && abs(eta)>0.655  ) * (  9e-3)+ \
+			(energy >= 500 )*(abs(eta) <=0.655 && abs(eta)> 0.455 ) * (  1e-2)+ \
+			(energy >= 500 )*(abs(eta) <=0.455 && abs(eta)>0.27   ) * (  1e-2)+ \
+			(energy >= 500 )*(abs(eta) <=0.27 && abs(eta)> 0.09   ) * (  1e-2)+ \
+			(energy >= 500 )*(abs(eta) <=0.09                     ) * (  1e-2)+ \
+			(energy < 500 && energy >= 250)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (  2e-2)+ \
+			(energy < 500 && energy >= 250)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (  6e-3)+ \
+			(energy < 500 && energy >= 250)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (  5e-3)+ \
+			(energy < 500 && energy >= 250)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * (  5e-3)+ \
+			(energy < 500 && energy >= 250)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * (  4e-3)+ \
+			(energy < 500 && energy >= 250)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (  4e-3)+ \
+			(energy < 500 && energy >= 250)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * (  3e-3)+ \
+			(energy < 500 && energy >= 250)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (  4e-3)+ \
+			(energy < 500 && energy >= 250)*( abs(eta) <=0.09                     ) * (    3e-3)+ \
+			(energy < 250 && energy >= 100)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (    3e-2)+ \
+			(energy < 250 && energy >= 100)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (    4e-3)+ \
+			(energy < 250 && energy >= 100)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (    3e-3)+ \
+			(energy < 250 && energy >= 100)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * (    2e-3)+ \
+			(energy < 250 && energy >= 100)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * (    1e-3)+ \
+			(energy < 250 && energy >= 100)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (    1e-3)+ \
+			(energy < 250 && energy >= 100)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * (    1e-3)+ \
+			(energy < 250 && energy >= 100)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (    1e-3)+ \
+			(energy < 250 && energy >= 100)*( abs(eta) <=0.09                     ) * (    1e-3)+ \
+			(energy < 100 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (    3e-2 )+ \
+			(energy < 100 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (    7e-3 )+ \
+			(energy < 100 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (    3e-3 )+ \
+			(energy < 100 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * (    2e-3 )+ \
+			(energy < 100 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * (    1e-3 )+ \
+			(energy < 100 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (    1e-3 )+ \
+			(energy < 100 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * (    9e-4 )+ \
+			(energy < 100 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (    9e-4 )+ \
+			(energy < 100 )*( abs(eta) <=0.09                     ) * (    7e-4 )}
+
Index: cards/CLICdet/CLICdet_BTag_70.tcl
===================================================================
--- cards/CLICdet/CLICdet_BTag_70.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
+++ cards/CLICdet/CLICdet_BTag_70.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
@@ -0,0 +1,81 @@
+# efficiency formula for b-jets
+add EfficiencyFormula {5} {0.7}
+# default efficiency formula (misidentification rate)
+add EfficiencyFormula {0} {(energy >= 500 )*
+	(energy >= 500 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-2 )+ \
+							   (energy >= 500 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 9e-3 )+ \
+							   (energy >= 500 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 8e-3 )+ \
+							   (energy >= 500 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 8e-3 )+ \
+							   (energy >= 500 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 1e-2 )+ \
+							   (energy >= 500 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 9e-3 )+ \
+							   (energy >= 500 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-2 )+ \
+							   (energy >= 500 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 1e-2 )+ \
+							   (energy >= 500 )*( abs(eta) <=0.09                     ) * ( 1e-2 )+ \
+							   (energy < 500 && energy >= 250)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-2 )+ \
+							   (energy < 500 && energy >= 250)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 7e-3 )+ \
+							   (energy < 500 && energy >= 250)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 6e-3 )+ \
+							   (energy < 500 && energy >= 250)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 6e-3 )+ \
+							   (energy < 500 && energy >= 250)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 5e-3 )+ \
+							   (energy < 500 && energy >= 250)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 5e-3 )+ \
+							   (energy < 500 && energy >= 250)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 5e-3 )+ \
+							   (energy < 500 && energy >= 250)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 5e-3 )+ \
+							   (energy < 500 && energy >= 250)*( abs(eta) <=0.09                     ) * ( 5e-3 )+ \
+							   (energy < 250 && energy >= 100)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-2 )+ \
+							   (energy < 250 && energy >= 100)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-3 )+ \
+							   (energy < 250 && energy >= 100)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-3 )+ \
+							   (energy < 250 && energy >= 100)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-3 )+ \
+							   (energy < 250 && energy >= 100)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-3 )+ \
+							   (energy < 250 && energy >= 100)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 2e-3 )+ \
+							   (energy < 250 && energy >= 100)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 2e-3 )+ \
+							   (energy < 250 && energy >= 100)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 2e-3 )+ \
+							   (energy < 250 && energy >= 100)*( abs(eta) <=0.09                     ) * ( 2e-3 )+ \
+							   (energy < 100 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-2 )+ \
+							   (energy < 100 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 6e-3 )+ \
+							   (energy < 100 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-3 )+ \
+							   (energy < 100 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 2e-3 )+ \
+							   (energy < 100 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 1e-3 )+ \
+							   (energy < 100 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 1e-3 )+ \
+							   (energy < 100 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-3 )+ \
+							   (energy < 100 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 1e-3 )+ \
+							   (energy < 100 )*( abs(eta) <=0.09                     ) * ( 1e-3 )
+}
+
+# efficiency formula for c-jets (misidentification rate)
+add EfficiencyFormula {4} {
+	(energy >= 500 )*(abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 1e-1 )+ \
+		(energy >= 500 )*(abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-2 )+ \
+		(energy >= 500 )*(abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-2 )+ \
+		(energy >= 500 )*(abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-2 )+ \
+		(energy >= 500 )*(abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 4e-2 )+ \
+		(energy >= 500 )*(abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 4e-2 )+ \
+		(energy >= 500 )*(abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 5e-2 )+ \
+		(energy >= 500 )*(abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 5e-2 )+ \
+		(energy >= 500 )*(abs(eta) <=0.09                     ) * ( 6e-2 )+ \
+		(energy < 500 && energy >= 250)*(abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 1e-1 )+ \
+		(energy < 500 && energy >= 250)*(abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-2 )+ \
+		(energy < 500 && energy >= 250)*(abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-2 )+ \
+		(energy < 500 && energy >= 250)*(abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 2e-2 )+ \
+		(energy < 500 && energy >= 250)*(abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 1e-2 )+ \
+		(energy < 500 && energy >= 250)*(abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 1e-2 )+ \
+		(energy < 500 && energy >= 250)*(abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-2 )+ \
+		(energy < 500 && energy >= 250)*(abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 1e-2 )+ \
+		(energy < 500 && energy >= 250)*(abs(eta) <=0.09                     ) * ( 1e-2 )+ \
+		(energy < 250 && energy >= 100)*(abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 1e-1 )+ \
+		(energy < 250 && energy >= 100)*(abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-2 )+ \
+		(energy < 250 && energy >= 100)*(abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 2e-2 )+ \
+		(energy < 250 && energy >= 100)*(abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 1e-2 )+ \
+		(energy < 250 && energy >= 100)*(abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 1e-2 )+ \
+		(energy < 250 && energy >= 100)*(abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 8e-3 )+ \
+		(energy < 250 && energy >= 100)*(abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 7e-3 )+ \
+		(energy < 250 && energy >= 100)*(abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 7e-3 )+ \
+		(energy < 250 && energy >= 100)*(abs(eta) <=0.09                     ) * ( 7e-3 )+ \
+		(energy < 100 )* (abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 1e-1 )+ \
+		(energy < 100 )* (abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 7e-2 )+ \
+		(energy < 100 )* (abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 4e-2 )+ \
+		(energy < 100 )* (abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 2e-2 )+ \
+		(energy < 100 )* (abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 1e-2 )+ \
+		(energy < 100 )* (abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 1e-2 )+ \
+		(energy < 100 )* (abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-2 )+ \
+		(energy < 100 )* (abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 9e-3 )+ \
+		(energy < 100 )* (abs(eta) <=0.09                     ) * ( 9e-3 )
+}
Index: cards/CLICdet/CLICdet_BTag_90.tcl
===================================================================
--- cards/CLICdet/CLICdet_BTag_90.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
+++ cards/CLICdet/CLICdet_BTag_90.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
@@ -0,0 +1,81 @@
+# efficiency formula for b-jets
+add EfficiencyFormula {5} {0.9}
+# default efficiency formula (misidentification rate)
+add EfficiencyFormula {0} {
+	(energy >= 500 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-1 )+ \
+		(energy >= 500 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 5e-2 )+ \
+		(energy >= 500 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 4e-2 )+ \
+		(energy >= 500 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 5e-2 )+ \
+		(energy >= 500 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 6e-2 )+ \
+		(energy >= 500 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 7e-2 )+ \
+		(energy >= 500 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 7e-2 )+ \
+		(energy >= 500 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 8e-2 )+ \
+		(energy >= 500 )*( abs(eta) <=0.09                     ) * ( 8e-2 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-1 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-2 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-2 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-2 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-2 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 2e-2 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 2e-2 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 2e-2 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=0.09                     ) * ( 2e-2 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-1 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 5e-2 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-2 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 2e-2 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-2 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 1e-2 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-2 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 1e-2 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=0.09                     ) * ( 1e-2 )+ \
+		(energy < 100 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-1 )+ \
+		(energy < 100 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 8e-2 )+ \
+		(energy < 100 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 4e-2 )+ \
+		(energy < 100 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-2 )+ \
+		(energy < 100 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-2 )+ \
+		(energy < 100 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 1e-2 )+ \
+		(energy < 100 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-2 )+ \
+		(energy < 100 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 1e-2 )+ \
+		(energy < 100 )*( abs(eta) <=0.09                     ) * ( 1e-2 )
+}
+
+# efficiency formula for c-jets (misidentification rate)
+add EfficiencyFormula {4} {
+	(energy >= 500 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 8e-1 )+ \
+		(energy >= 500 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-1 )+ \
+		(energy >= 500 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-1 )+ \
+		(energy >= 500 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-1 )+ \
+		(energy >= 500 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 3e-1 )+ \
+		(energy >= 500 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 3e-1 )+ \
+		(energy >= 500 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 4e-1 )+ \
+		(energy >= 500 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 4e-1 )+ \
+		(energy >= 500 )*( abs(eta) <=0.09                     ) * ( 4e-1 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 6e-1 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 5e-1 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 4e-1 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-1 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-1 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 2e-1 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 2e-1 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 2e-1 )+ \
+		(energy < 500 && energy >= 250)*( abs(eta) <=0.09                     ) * ( 2e-1 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 5e-1 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-1 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-1 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 2e-1 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-1 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 2e-1 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 2e-1 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 2e-1 )+ \
+		(energy < 250 && energy >= 100)*( abs(eta) <=0.09                     ) * ( 2e-1 )+ \
+		(energy < 100 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 5e-1 )+ \
+		(energy < 100 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 5e-1 )+ \
+		(energy < 100 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 4e-1 )+ \
+		(energy < 100 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-1 )+ \
+		(energy < 100 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 3e-1 )+ \
+		(energy < 100 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 2e-1 )+ \
+		(energy < 100 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 2e-1 )+ \
+		(energy < 100 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 2e-1 )+ \
+		(energy < 100 )*( abs(eta) <=0.09                     ) * ( 2e-1 )
+}
Index: cards/CLICdet/CLICdet_BTagging.tcl
===================================================================
--- cards/CLICdet/CLICdet_BTagging.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
+++ cards/CLICdet/CLICdet_BTagging.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
@@ -0,0 +1,383 @@
+module BTagging BTaggingWP50_R05N2 {
+	set JetInputArray FastJetFinderVLC_R05_N2/VLCjetsR05N2
+	set BitNumber 0
+
+	# 50% efficiency working point
+    # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
+    # PDG code = the highest PDG code of a quark or gluon inside DeltaR cone around jet axis
+    # gluon's PDG code has the lowest priority
+
+	# based on CLICdp-Note-2014-002
+
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R05N2 {
+	set JetInputArray FastJetFinderVLC_R05_N2/VLCjetsR05N2
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R05N2 {
+	set JetInputArray FastJetFinderVLC_R05_N2/VLCjetsR05N2
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R05N3 {
+	set JetInputArray FastJetFinderVLC_R05_N3/VLCjetsR05N3
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R05N3 {
+	set JetInputArray FastJetFinderVLC_R05_N3/VLCjetsR05N3
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R05N3 {
+	set JetInputArray FastJetFinderVLC_R05_N3/VLCjetsR05N3
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R05N4 {
+	set JetInputArray FastJetFinderVLC_R05_N4/VLCjetsR05N4
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R05N4 {
+	set JetInputArray FastJetFinderVLC_R05_N4/VLCjetsR05N4
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R05N4 {
+	set JetInputArray FastJetFinderVLC_R05_N4/VLCjetsR05N4
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R05N5 {
+	set JetInputArray FastJetFinderVLC_R05_N5/VLCjetsR05N5
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R05N5 {
+	set JetInputArray FastJetFinderVLC_R05_N5/VLCjetsR05N5
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R05N5 {
+	set JetInputArray FastJetFinderVLC_R05_N5/VLCjetsR05N5
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R05N6 {
+	set JetInputArray FastJetFinderVLC_R05_N6/VLCjetsR05N6
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R05N6 {
+	set JetInputArray FastJetFinderVLC_R05_N6/VLCjetsR05N6
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R05N6 {
+	set JetInputArray FastJetFinderVLC_R05_N6/VLCjetsR05N6
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R07N2 {
+	set JetInputArray FastJetFinderVLC_R07_N2/VLCjetsR07N2
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R07N2 {
+	set JetInputArray FastJetFinderVLC_R07_N2/VLCjetsR07N2
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R07N2 {
+	set JetInputArray FastJetFinderVLC_R07_N2/VLCjetsR07N2
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R07N3 {
+	set JetInputArray FastJetFinderVLC_R07_N3/VLCjetsR07N3
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R07N3 {
+	set JetInputArray FastJetFinderVLC_R07_N3/VLCjetsR07N3
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R07N3 {
+	set JetInputArray FastJetFinderVLC_R07_N3/VLCjetsR07N3
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R07N4 {
+	set JetInputArray FastJetFinderVLC_R07_N4/VLCjetsR07N4
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R07N4 {
+	set JetInputArray FastJetFinderVLC_R07_N4/VLCjetsR07N4
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R07N4 {
+	set JetInputArray FastJetFinderVLC_R07_N4/VLCjetsR07N4
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R07N5 {
+	set JetInputArray FastJetFinderVLC_R07_N5/VLCjetsR07N5
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R07N5 {
+	set JetInputArray FastJetFinderVLC_R07_N5/VLCjetsR07N5
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R07N5 {
+	set JetInputArray FastJetFinderVLC_R07_N5/VLCjetsR07N5
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R07N6 {
+	set JetInputArray FastJetFinderVLC_R07_N6/VLCjetsR07N6
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R07N6 {
+	set JetInputArray FastJetFinderVLC_R07_N6/VLCjetsR07N6
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R07N6 {
+	set JetInputArray FastJetFinderVLC_R07_N6/VLCjetsR07N6
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R10N2 {
+	set JetInputArray FastJetFinderVLC_R10_N2/VLCjetsR10N2
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R10N2 {
+	set JetInputArray FastJetFinderVLC_R10_N2/VLCjetsR10N2
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R10N2 {
+	set JetInputArray FastJetFinderVLC_R10_N2/VLCjetsR10N2
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R10N3 {
+	set JetInputArray FastJetFinderVLC_R10_N3/VLCjetsR10N3
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R10N3 {
+	set JetInputArray FastJetFinderVLC_R10_N3/VLCjetsR10N3
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R10N3 {
+	set JetInputArray FastJetFinderVLC_R10_N3/VLCjetsR10N3
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R10N4 {
+	set JetInputArray FastJetFinderVLC_R10_N4/VLCjetsR10N4
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R10N4 {
+	set JetInputArray FastJetFinderVLC_R10_N4/VLCjetsR10N4
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R10N4 {
+	set JetInputArray FastJetFinderVLC_R10_N4/VLCjetsR10N4
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R10N5 {
+	set JetInputArray FastJetFinderVLC_R10_N5/VLCjetsR10N5
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R10N5 {
+	set JetInputArray FastJetFinderVLC_R10_N5/VLCjetsR10N5
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R10N5 {
+	set JetInputArray FastJetFinderVLC_R10_N5/VLCjetsR10N5
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R10N6 {
+	set JetInputArray FastJetFinderVLC_R10_N6/VLCjetsR10N6
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R10N6 {
+	set JetInputArray FastJetFinderVLC_R10_N6/VLCjetsR10N6
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R10N6 {
+	set JetInputArray FastJetFinderVLC_R10_N6/VLCjetsR10N6
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R12N2 {
+	set JetInputArray FastJetFinderVLC_R12_N2/VLCjetsR12N2
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R12N2 {
+	set JetInputArray FastJetFinderVLC_R12_N2/VLCjetsR12N2
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R12N2 {
+	set JetInputArray FastJetFinderVLC_R12_N2/VLCjetsR12N2
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R12N3 {
+	set JetInputArray FastJetFinderVLC_R12_N3/VLCjetsR12N3
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R12N3 {
+	set JetInputArray FastJetFinderVLC_R12_N3/VLCjetsR12N3
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R12N3 {
+	set JetInputArray FastJetFinderVLC_R12_N3/VLCjetsR12N3
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R12N4 {
+	set JetInputArray FastJetFinderVLC_R12_N4/VLCjetsR12N4
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R12N4 {
+	set JetInputArray FastJetFinderVLC_R12_N4/VLCjetsR12N4
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R12N4 {
+	set JetInputArray FastJetFinderVLC_R12_N4/VLCjetsR12N4
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R12N5 {
+	set JetInputArray FastJetFinderVLC_R12_N5/VLCjetsR12N5
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R12N5 {
+	set JetInputArray FastJetFinderVLC_R12_N5/VLCjetsR12N5
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R12N5 {
+	set JetInputArray FastJetFinderVLC_R12_N5/VLCjetsR12N5
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R12N6 {
+	set JetInputArray FastJetFinderVLC_R12_N6/VLCjetsR12N6
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R12N6 {
+	set JetInputArray FastJetFinderVLC_R12_N6/VLCjetsR12N6
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R12N6 {
+	set JetInputArray FastJetFinderVLC_R12_N6/VLCjetsR12N6
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R15N2 {
+	set JetInputArray FastJetFinderVLC_R15_N2/VLCjetsR15N2
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R15N2 {
+	set JetInputArray FastJetFinderVLC_R15_N2/VLCjetsR15N2
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R15N2 {
+	set JetInputArray FastJetFinderVLC_R15_N2/VLCjetsR15N2
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R15N3 {
+	set JetInputArray FastJetFinderVLC_R15_N3/VLCjetsR15N3
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R15N3 {
+	set JetInputArray FastJetFinderVLC_R15_N3/VLCjetsR15N3
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R15N3 {
+	set JetInputArray FastJetFinderVLC_R15_N3/VLCjetsR15N3
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R15N4 {
+	set JetInputArray FastJetFinderVLC_R15_N4/VLCjetsR15N4
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R15N4 {
+	set JetInputArray FastJetFinderVLC_R15_N4/VLCjetsR15N4
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R15N4 {
+	set JetInputArray FastJetFinderVLC_R15_N4/VLCjetsR15N4
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R15N5 {
+	set JetInputArray FastJetFinderVLC_R15_N5/VLCjetsR15N5
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R15N5 {
+	set JetInputArray FastJetFinderVLC_R15_N5/VLCjetsR15N5
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R15N5 {
+	set JetInputArray FastJetFinderVLC_R15_N5/VLCjetsR15N5
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
+module BTagging BTaggingWP50_R15N6 {
+	set JetInputArray FastJetFinderVLC_R15_N6/VLCjetsR15N6
+	set BitNumber 0
+	source CLICdet/CLICdet_BTag_50.tcl
+}
+module BTagging BTaggingWP70_R15N6 {
+	set JetInputArray FastJetFinderVLC_R15_N6/VLCjetsR15N6
+	set BitNumber 1
+	source CLICdet/CLICdet_BTag_70.tcl
+}
+module BTagging BTaggingWP90_R15N6 {
+	set JetInputArray FastJetFinderVLC_R15_N6/VLCjetsR15N6
+	set BitNumber 2
+	source CLICdet/CLICdet_BTag_90.tcl
+}
Index: cards/CLICdet/CLICdet_JetFlavorAssociation.tcl
===================================================================
--- cards/CLICdet/CLICdet_JetFlavorAssociation.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
+++ cards/CLICdet/CLICdet_JetFlavorAssociation.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
@@ -0,0 +1,310 @@
+module JetFlavorAssociation JetFlavorAssociation_R05N2 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R05_N2/VLCjetsR05N2
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R05N3 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R05_N3/VLCjetsR05N3
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R05N4 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R05_N4/VLCjetsR05N4
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R05N5 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R05_N5/VLCjetsR05N5
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R05N6 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R05_N6/VLCjetsR05N6
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+
+#R07
+module JetFlavorAssociation JetFlavorAssociation_R07N2 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R07_N2/VLCjetsR07N2
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R07N3 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R07_N3/VLCjetsR07N3
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R07N4 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R07_N4/VLCjetsR07N4
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R07N5 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R07_N5/VLCjetsR07N5
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R07N6 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R07_N6/VLCjetsR07N6
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+
+
+#R10
+module JetFlavorAssociation JetFlavorAssociation_R10N2 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R10_N2/VLCjetsR10N2
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R10N3 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R10_N3/VLCjetsR10N3
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R10N4 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R10_N4/VLCjetsR10N4
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R10N5 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R10_N5/VLCjetsR10N5
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R10N6 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R10_N6/VLCjetsR10N6
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+
+
+# R 12
+module JetFlavorAssociation JetFlavorAssociation_R12N2 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R12_N2/VLCjetsR12N2
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R12N3 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R12_N3/VLCjetsR12N3
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R12N4 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R12_N4/VLCjetsR12N4
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R12N5 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R12_N5/VLCjetsR12N5
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R12N6 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R12_N6/VLCjetsR12N6
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+
+# R15
+module JetFlavorAssociation JetFlavorAssociation_R15N2 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R15_N2/VLCjetsR15N2
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R15N3 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R15_N3/VLCjetsR15N3
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R15N4 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R15_N4/VLCjetsR15N4
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R15N5 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R15_N5/VLCjetsR15N5
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
+module JetFlavorAssociation JetFlavorAssociation_R15N6 {
+
+    set PartonInputArray Delphes/partons
+    set ParticleInputArray Delphes/allParticles
+    set ParticleLHEFInputArray Delphes/allParticlesLHEF
+    set JetInputArray FastJetFinderVLC_R15_N6/VLCjetsR15N6
+
+    set DeltaR 0.5
+    set PartonPTMin 1.0
+    set PartonEtaMax 2.5
+
+}
Index: cards/CLICdet/CLICdet_JetReco.tcl
===================================================================
--- cards/CLICdet/CLICdet_JetReco.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
+++ cards/CLICdet/CLICdet_JetReco.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
@@ -0,0 +1,313 @@
+
+############
+# Jet finder VLC
+############
+#R05 N2
+module FastJetFinder FastJetFinderVLC_R05_N2 {
+    #  set InputArray Calorimeter/towers
+    set InputArray EFlowFilter/eflow
+
+    set OutputArray VLCjetsR05N2
+
+    # algorithm: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt, 7 anti-kt with winner-take-all axis (for N-subjettiness), 8 N-jettiness, 9 Valencia
+    set NJets 2
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 0.5
+    set Beta 1.0
+    set Gamma 1.0
+
+    set JetPTMin 20.0
+}
+#R05 N3
+module FastJetFinder FastJetFinderVLC_R05_N3 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR05N3
+    set NJets 3
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 0.5
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R05 N4
+module FastJetFinder FastJetFinderVLC_R05_N4 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR05N4
+    set NJets 4
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 0.5
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R05 N5
+module FastJetFinder FastJetFinderVLC_R05_N5 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR05N5
+    set NJets 5
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 0.5
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R05 N6
+module FastJetFinder FastJetFinderVLC_R05_N6 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR05N6
+    set NJets 6
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 0.5
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R07 N2
+module FastJetFinder FastJetFinderVLC_R07_N2 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR07N2
+    set NJets 2
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 0.7
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R07 N3
+module FastJetFinder FastJetFinderVLC_R07_N3 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR07N3
+    set NJets 3
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 0.7
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R07 N4
+module FastJetFinder FastJetFinderVLC_R07_N4 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR07N4
+    set NJets 4
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 0.7
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R07 N5
+module FastJetFinder FastJetFinderVLC_R07_N5 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR07N5
+    set NJets 5
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 0.7
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R07 N6
+module FastJetFinder FastJetFinderVLC_R07_N6 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR07N6
+    set NJets 6
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 0.7
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+
+#R10N2
+module FastJetFinder FastJetFinderVLC_R10_N2 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR10N2
+    set NJets 2
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.0
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R10 N3
+module FastJetFinder FastJetFinderVLC_R10_N3 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR10N3
+    set NJets 3
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.0
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R10 N4
+module FastJetFinder FastJetFinderVLC_R10_N4 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR10N4
+    set NJets 4
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.0
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R10 N5
+module FastJetFinder FastJetFinderVLC_R10_N5 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR10N5
+    set NJets 5
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.0
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R10 N6
+module FastJetFinder FastJetFinderVLC_R10_N6 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR10N6
+    set NJets 6
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.0
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+
+#R12 N2
+module FastJetFinder FastJetFinderVLC_R12_N2 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR12N2
+    set NJets 2
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.2
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R12 N3
+module FastJetFinder FastJetFinderVLC_R12_N3 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR12N3
+    set NJets 3
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.2
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R12 N4
+module FastJetFinder FastJetFinderVLC_R12_N4 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR12N4
+    set NJets 4
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.2
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R12 N5
+module FastJetFinder FastJetFinderVLC_R12_N5 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR12N5
+    set NJets 5
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.2
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R12 N6
+module FastJetFinder FastJetFinderVLC_R12_N6 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR12N6
+    set NJets 6
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.2
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+
+
+#R15 N2
+module FastJetFinder FastJetFinderVLC_R15_N2 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR15N2
+    set NJets 2
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.5
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R15 N3
+module FastJetFinder FastJetFinderVLC_R15_N3 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR15N3
+    set NJets 3
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.5
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R15 N4
+module FastJetFinder FastJetFinderVLC_R15_N4 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR15N4
+    set NJets 4
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.5
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R15 N5
+module FastJetFinder FastJetFinderVLC_R15_N5 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR15N5
+    set NJets 5
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.5
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
+#R15 N6
+module FastJetFinder FastJetFinderVLC_R15_N6 {
+    set InputArray EFlowFilter/eflow
+    set OutputArray VLCjetsR15N6
+    set NJets 6
+    set ExclusiveClustering true
+    set JetAlgorithm 9
+    set ParameterR 1.5
+    set Beta 1.0
+    set Gamma 1.0
+    set JetPTMin 20.0
+}
Index: cards/CLICdet_BTag_50.tcl
===================================================================
--- cards/CLICdet_BTag_50.tcl	(revision 5953e02f68d23a0304b6289edd9f0e861e0089af)
+++ 	(revision )
@@ -1,81 +1,0 @@
-    # efficiency formula for b-jets
-    add EfficiencyFormula {5} {0.5}
-
-    # default efficiency formula (misidentification rate)
-add EfficiencyFormula {0} {
-	(energy >= 500 )* ( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (  6e-3 )+ \
-		(energy >= 500 )* ( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (  3e-3 )+ \
-		(energy >= 500 )* ( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (  2e-3 )+ \
-		(energy >= 500 )* ( abs(eta) <=1.165 && abs(eta)>0.885  ) * (  2e-3 )+ \
-		(energy >= 500 )* ( abs(eta) <=0.885 && abs(eta)>0.655  ) * (  2e-3 )+ \
-		(energy >= 500 )* ( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (  2e-3 )+ \
-		(energy >= 500 )* ( abs(eta) <=0.455 && abs(eta)>0.27   ) * (  3e-3 )+ \
-		(energy >= 500 )* ( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (  3e-3 )+ \
-		(energy >= 500 )* ( abs(eta) <=0.09                     ) * (  3e-3 )+ \
-		(energy < 500 && energy >= 250)* ( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (  5e-3 )+ \
-		(energy < 500 && energy >= 250)* ( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (  2e-3 )+ \
-		(energy < 500 && energy >= 250)* ( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (  1e-3 )+ \
-		(energy < 500 && energy >= 250)* ( abs(eta) <=1.165 && abs(eta)>0.885  ) * (  1e-3 )+ \
-		(energy < 500 && energy >= 250)* ( abs(eta) <=0.885 && abs(eta)>0.655  ) * (  1e-3 )+ \
-		(energy < 500 && energy >= 250)* ( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (  1e-3 )+ \
-		(energy < 500 && energy >= 250)* ( abs(eta) <=0.455 && abs(eta)>0.27   ) * (  1e-3 )+ \
-		(energy < 500 && energy >= 250)* ( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (  1e-3 )+ \
-		(energy < 500 && energy >= 250)* ( abs(eta) <=0.09                     ) * (  1e-3 )+ \
-		(energy < 250 && energy >= 100)* ( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 3e-3)+ \
-		(energy < 250 && energy >= 100)* ( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 1e-3)+ \
-		(energy < 250 && energy >= 100)* ( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 9e-4)+ \
-		(energy < 250 && energy >= 100)* ( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 9e-4)+ \
-		(energy < 250 && energy >= 100)* ( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 8e-4)+ \
-		(energy < 250 && energy >= 100)* ( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 7e-4)+ \
-		(energy < 250 && energy >= 100)* ( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 7e-4)+ \
-		(energy < 250 && energy >= 100)* ( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 7e-4)+ \
-		(energy < 250 && energy >= 100)* ( abs(eta) <=0.09                     ) * ( 7e-4)+ \
-		(energy < 100 )* ( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (   2e-3 )+ \
-		(energy < 100 )* ( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (   7e-4 )+ \
-		(energy < 100 )* ( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (   5e-4 )+ \
-		(energy < 100 )* ( abs(eta) <=1.165 && abs(eta)>0.885  ) * (   4e-4 )+ \
-		(energy < 100 )* ( abs(eta) <=0.885 && abs(eta)>0.655  ) * (   3e-4 )+ \
-		(energy < 100 )* ( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (   2e-4 )+ \
-		(energy < 100 )* ( abs(eta) <=0.455 && abs(eta)>0.27   ) * (   2e-4 )+ \
-		(energy < 100 )* ( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (   2e-4 )+ \
-		(energy < 100 )* ( abs(eta) <=0.09                     ) * (   3e-4 )}
-
-    # efficiency formula for c-jets (misidentification rate)
-    add EfficiencyFormula {4} {
-		(energy >= 500 )*(abs(eta) <=2.66 && abs(eta) > 2.09  ) * (  2e-2)+ \
-			(energy >= 500 )*(abs(eta) <=2.09 && abs(eta) > 1.53  ) * (  1e-2)+ \
-			(energy >= 500 )*(abs(eta) <=1.53 && abs(eta)> 1.165  ) * (  8e-3)+ \
-			(energy >= 500 )*(abs(eta) <=1.165 && abs(eta)>0.885  ) * (  8e-3)+ \
-			(energy >= 500 )*(abs(eta) <=0.885 && abs(eta)>0.655  ) * (  9e-3)+ \
-			(energy >= 500 )*(abs(eta) <=0.655 && abs(eta)> 0.455 ) * (  1e-2)+ \
-			(energy >= 500 )*(abs(eta) <=0.455 && abs(eta)>0.27   ) * (  1e-2)+ \
-			(energy >= 500 )*(abs(eta) <=0.27 && abs(eta)> 0.09   ) * (  1e-2)+ \
-			(energy >= 500 )*(abs(eta) <=0.09                     ) * (  1e-2)+ \
-			(energy < 500 && energy >= 250)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (  2e-2)+ \
-			(energy < 500 && energy >= 250)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (  6e-3)+ \
-			(energy < 500 && energy >= 250)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (  5e-3)+ \
-			(energy < 500 && energy >= 250)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * (  5e-3)+ \
-			(energy < 500 && energy >= 250)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * (  4e-3)+ \
-			(energy < 500 && energy >= 250)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (  4e-3)+ \
-			(energy < 500 && energy >= 250)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * (  3e-3)+ \
-			(energy < 500 && energy >= 250)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (  4e-3)+ \
-			(energy < 500 && energy >= 250)*( abs(eta) <=0.09                     ) * (    3e-3)+ \
-			(energy < 250 && energy >= 100)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (    3e-2)+ \
-			(energy < 250 && energy >= 100)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (    4e-3)+ \
-			(energy < 250 && energy >= 100)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (    3e-3)+ \
-			(energy < 250 && energy >= 100)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * (    2e-3)+ \
-			(energy < 250 && energy >= 100)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * (    1e-3)+ \
-			(energy < 250 && energy >= 100)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (    1e-3)+ \
-			(energy < 250 && energy >= 100)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * (    1e-3)+ \
-			(energy < 250 && energy >= 100)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (    1e-3)+ \
-			(energy < 250 && energy >= 100)*( abs(eta) <=0.09                     ) * (    1e-3)+ \
-			(energy < 100 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * (    3e-2 )+ \
-			(energy < 100 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * (    7e-3 )+ \
-			(energy < 100 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * (    3e-3 )+ \
-			(energy < 100 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * (    2e-3 )+ \
-			(energy < 100 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * (    1e-3 )+ \
-			(energy < 100 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * (    1e-3 )+ \
-			(energy < 100 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * (    9e-4 )+ \
-			(energy < 100 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * (    9e-4 )+ \
-			(energy < 100 )*( abs(eta) <=0.09                     ) * (    7e-4 )}
-
Index: cards/CLICdet_BTag_70.tcl
===================================================================
--- cards/CLICdet_BTag_70.tcl	(revision 5953e02f68d23a0304b6289edd9f0e861e0089af)
+++ 	(revision )
@@ -1,81 +1,0 @@
-# efficiency formula for b-jets
-add EfficiencyFormula {5} {0.7}
-# default efficiency formula (misidentification rate)
-add EfficiencyFormula {0} {(energy >= 500 )*
-	(energy >= 500 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-2 )+ \
-							   (energy >= 500 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 9e-3 )+ \
-							   (energy >= 500 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 8e-3 )+ \
-							   (energy >= 500 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 8e-3 )+ \
-							   (energy >= 500 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 1e-2 )+ \
-							   (energy >= 500 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 9e-3 )+ \
-							   (energy >= 500 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-2 )+ \
-							   (energy >= 500 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 1e-2 )+ \
-							   (energy >= 500 )*( abs(eta) <=0.09                     ) * ( 1e-2 )+ \
-							   (energy < 500 && energy >= 250)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-2 )+ \
-							   (energy < 500 && energy >= 250)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 7e-3 )+ \
-							   (energy < 500 && energy >= 250)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 6e-3 )+ \
-							   (energy < 500 && energy >= 250)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 6e-3 )+ \
-							   (energy < 500 && energy >= 250)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 5e-3 )+ \
-							   (energy < 500 && energy >= 250)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 5e-3 )+ \
-							   (energy < 500 && energy >= 250)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 5e-3 )+ \
-							   (energy < 500 && energy >= 250)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 5e-3 )+ \
-							   (energy < 500 && energy >= 250)*( abs(eta) <=0.09                     ) * ( 5e-3 )+ \
-							   (energy < 250 && energy >= 100)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-2 )+ \
-							   (energy < 250 && energy >= 100)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-3 )+ \
-							   (energy < 250 && energy >= 100)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-3 )+ \
-							   (energy < 250 && energy >= 100)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-3 )+ \
-							   (energy < 250 && energy >= 100)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-3 )+ \
-							   (energy < 250 && energy >= 100)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 2e-3 )+ \
-							   (energy < 250 && energy >= 100)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 2e-3 )+ \
-							   (energy < 250 && energy >= 100)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 2e-3 )+ \
-							   (energy < 250 && energy >= 100)*( abs(eta) <=0.09                     ) * ( 2e-3 )+ \
-							   (energy < 100 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-2 )+ \
-							   (energy < 100 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 6e-3 )+ \
-							   (energy < 100 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-3 )+ \
-							   (energy < 100 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 2e-3 )+ \
-							   (energy < 100 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 1e-3 )+ \
-							   (energy < 100 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 1e-3 )+ \
-							   (energy < 100 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-3 )+ \
-							   (energy < 100 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 1e-3 )+ \
-							   (energy < 100 )*( abs(eta) <=0.09                     ) * ( 1e-3 )
-}
-
-# efficiency formula for c-jets (misidentification rate)
-add EfficiencyFormula {4} {
-	(energy >= 500 )*(abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 1e-1 )+ \
-		(energy >= 500 )*(abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-2 )+ \
-		(energy >= 500 )*(abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-2 )+ \
-		(energy >= 500 )*(abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-2 )+ \
-		(energy >= 500 )*(abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 4e-2 )+ \
-		(energy >= 500 )*(abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 4e-2 )+ \
-		(energy >= 500 )*(abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 5e-2 )+ \
-		(energy >= 500 )*(abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 5e-2 )+ \
-		(energy >= 500 )*(abs(eta) <=0.09                     ) * ( 6e-2 )+ \
-		(energy < 500 && energy >= 250)*(abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 1e-1 )+ \
-		(energy < 500 && energy >= 250)*(abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-2 )+ \
-		(energy < 500 && energy >= 250)*(abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-2 )+ \
-		(energy < 500 && energy >= 250)*(abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 2e-2 )+ \
-		(energy < 500 && energy >= 250)*(abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 1e-2 )+ \
-		(energy < 500 && energy >= 250)*(abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 1e-2 )+ \
-		(energy < 500 && energy >= 250)*(abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-2 )+ \
-		(energy < 500 && energy >= 250)*(abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 1e-2 )+ \
-		(energy < 500 && energy >= 250)*(abs(eta) <=0.09                     ) * ( 1e-2 )+ \
-		(energy < 250 && energy >= 100)*(abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 1e-1 )+ \
-		(energy < 250 && energy >= 100)*(abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-2 )+ \
-		(energy < 250 && energy >= 100)*(abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 2e-2 )+ \
-		(energy < 250 && energy >= 100)*(abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 1e-2 )+ \
-		(energy < 250 && energy >= 100)*(abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 1e-2 )+ \
-		(energy < 250 && energy >= 100)*(abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 8e-3 )+ \
-		(energy < 250 && energy >= 100)*(abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 7e-3 )+ \
-		(energy < 250 && energy >= 100)*(abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 7e-3 )+ \
-		(energy < 250 && energy >= 100)*(abs(eta) <=0.09                     ) * ( 7e-3 )+ \
-		(energy < 100 )* (abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 1e-1 )+ \
-		(energy < 100 )* (abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 7e-2 )+ \
-		(energy < 100 )* (abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 4e-2 )+ \
-		(energy < 100 )* (abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 2e-2 )+ \
-		(energy < 100 )* (abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 1e-2 )+ \
-		(energy < 100 )* (abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 1e-2 )+ \
-		(energy < 100 )* (abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-2 )+ \
-		(energy < 100 )* (abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 9e-3 )+ \
-		(energy < 100 )* (abs(eta) <=0.09                     ) * ( 9e-3 )
-}
Index: cards/CLICdet_BTag_90.tcl
===================================================================
--- cards/CLICdet_BTag_90.tcl	(revision 5953e02f68d23a0304b6289edd9f0e861e0089af)
+++ 	(revision )
@@ -1,81 +1,0 @@
-# efficiency formula for b-jets
-add EfficiencyFormula {5} {0.9}
-# default efficiency formula (misidentification rate)
-add EfficiencyFormula {0} {
-	(energy >= 500 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-1 )+ \
-		(energy >= 500 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 5e-2 )+ \
-		(energy >= 500 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 4e-2 )+ \
-		(energy >= 500 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 5e-2 )+ \
-		(energy >= 500 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 6e-2 )+ \
-		(energy >= 500 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 7e-2 )+ \
-		(energy >= 500 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 7e-2 )+ \
-		(energy >= 500 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 8e-2 )+ \
-		(energy >= 500 )*( abs(eta) <=0.09                     ) * ( 8e-2 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-1 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-2 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-2 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-2 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-2 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 2e-2 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 2e-2 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 2e-2 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=0.09                     ) * ( 2e-2 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-1 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 5e-2 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-2 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 2e-2 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-2 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 1e-2 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-2 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 1e-2 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=0.09                     ) * ( 1e-2 )+ \
-		(energy < 100 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 2e-1 )+ \
-		(energy < 100 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 8e-2 )+ \
-		(energy < 100 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 4e-2 )+ \
-		(energy < 100 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-2 )+ \
-		(energy < 100 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-2 )+ \
-		(energy < 100 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 1e-2 )+ \
-		(energy < 100 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 1e-2 )+ \
-		(energy < 100 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 1e-2 )+ \
-		(energy < 100 )*( abs(eta) <=0.09                     ) * ( 1e-2 )
-}
-
-# efficiency formula for c-jets (misidentification rate)
-add EfficiencyFormula {4} {
-	(energy >= 500 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 8e-1 )+ \
-		(energy >= 500 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-1 )+ \
-		(energy >= 500 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-1 )+ \
-		(energy >= 500 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-1 )+ \
-		(energy >= 500 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 3e-1 )+ \
-		(energy >= 500 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 3e-1 )+ \
-		(energy >= 500 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 4e-1 )+ \
-		(energy >= 500 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 4e-1 )+ \
-		(energy >= 500 )*( abs(eta) <=0.09                     ) * ( 4e-1 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 6e-1 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 5e-1 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 4e-1 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-1 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-1 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 2e-1 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 2e-1 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 2e-1 )+ \
-		(energy < 500 && energy >= 250)*( abs(eta) <=0.09                     ) * ( 2e-1 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 5e-1 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 4e-1 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 3e-1 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 2e-1 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 2e-1 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 2e-1 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 2e-1 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 2e-1 )+ \
-		(energy < 250 && energy >= 100)*( abs(eta) <=0.09                     ) * ( 2e-1 )+ \
-		(energy < 100 )*( abs(eta) <=2.66 && abs(eta) > 2.09  ) * ( 5e-1 )+ \
-		(energy < 100 )*( abs(eta) <=2.09 && abs(eta) > 1.53  ) * ( 5e-1 )+ \
-		(energy < 100 )*( abs(eta) <=1.53 && abs(eta)> 1.165  ) * ( 4e-1 )+ \
-		(energy < 100 )*( abs(eta) <=1.165 && abs(eta)>0.885  ) * ( 3e-1 )+ \
-		(energy < 100 )*( abs(eta) <=0.885 && abs(eta)>0.655  ) * ( 3e-1 )+ \
-		(energy < 100 )*( abs(eta) <=0.655 && abs(eta)> 0.455 ) * ( 2e-1 )+ \
-		(energy < 100 )*( abs(eta) <=0.455 && abs(eta)>0.27   ) * ( 2e-1 )+ \
-		(energy < 100 )*( abs(eta) <=0.27 && abs(eta)> 0.09   ) * ( 2e-1 )+ \
-		(energy < 100 )*( abs(eta) <=0.09                     ) * ( 2e-1 )
-}
Index: cards/CLICdet_BTagging.tcl
===================================================================
--- cards/CLICdet_BTagging.tcl	(revision 5953e02f68d23a0304b6289edd9f0e861e0089af)
+++ 	(revision )
@@ -1,383 +1,0 @@
-module BTagging BTaggingWP50_R05N2 {
-	set JetInputArray FastJetFinderVLC_R05_N2/VLCjetsR05N2
-	set BitNumber 0
-
-	# 50% efficiency working point
-    # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
-    # PDG code = the highest PDG code of a quark or gluon inside DeltaR cone around jet axis
-    # gluon's PDG code has the lowest priority
-
-	# based on CLICdp-Note-2014-002
-
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R05N2 {
-	set JetInputArray FastJetFinderVLC_R05_N2/VLCjetsR05N2
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R05N2 {
-	set JetInputArray FastJetFinderVLC_R05_N2/VLCjetsR05N2
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R05N3 {
-	set JetInputArray FastJetFinderVLC_R05_N3/VLCjetsR05N3
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R05N3 {
-	set JetInputArray FastJetFinderVLC_R05_N3/VLCjetsR05N3
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R05N3 {
-	set JetInputArray FastJetFinderVLC_R05_N3/VLCjetsR05N3
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R05N4 {
-	set JetInputArray FastJetFinderVLC_R05_N4/VLCjetsR05N4
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R05N4 {
-	set JetInputArray FastJetFinderVLC_R05_N4/VLCjetsR05N4
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R05N4 {
-	set JetInputArray FastJetFinderVLC_R05_N4/VLCjetsR05N4
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R05N5 {
-	set JetInputArray FastJetFinderVLC_R05_N5/VLCjetsR05N5
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R05N5 {
-	set JetInputArray FastJetFinderVLC_R05_N5/VLCjetsR05N5
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R05N5 {
-	set JetInputArray FastJetFinderVLC_R05_N5/VLCjetsR05N5
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R05N6 {
-	set JetInputArray FastJetFinderVLC_R05_N6/VLCjetsR05N6
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R05N6 {
-	set JetInputArray FastJetFinderVLC_R05_N6/VLCjetsR05N6
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R05N6 {
-	set JetInputArray FastJetFinderVLC_R05_N6/VLCjetsR05N6
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R07N2 {
-	set JetInputArray FastJetFinderVLC_R07_N2/VLCjetsR07N2
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R07N2 {
-	set JetInputArray FastJetFinderVLC_R07_N2/VLCjetsR07N2
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R07N2 {
-	set JetInputArray FastJetFinderVLC_R07_N2/VLCjetsR07N2
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R07N3 {
-	set JetInputArray FastJetFinderVLC_R07_N3/VLCjetsR07N3
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R07N3 {
-	set JetInputArray FastJetFinderVLC_R07_N3/VLCjetsR07N3
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R07N3 {
-	set JetInputArray FastJetFinderVLC_R07_N3/VLCjetsR07N3
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R07N4 {
-	set JetInputArray FastJetFinderVLC_R07_N4/VLCjetsR07N4
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R07N4 {
-	set JetInputArray FastJetFinderVLC_R07_N4/VLCjetsR07N4
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R07N4 {
-	set JetInputArray FastJetFinderVLC_R07_N4/VLCjetsR07N4
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R07N5 {
-	set JetInputArray FastJetFinderVLC_R07_N5/VLCjetsR07N5
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R07N5 {
-	set JetInputArray FastJetFinderVLC_R07_N5/VLCjetsR07N5
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R07N5 {
-	set JetInputArray FastJetFinderVLC_R07_N5/VLCjetsR07N5
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R07N6 {
-	set JetInputArray FastJetFinderVLC_R07_N6/VLCjetsR07N6
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R07N6 {
-	set JetInputArray FastJetFinderVLC_R07_N6/VLCjetsR07N6
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R07N6 {
-	set JetInputArray FastJetFinderVLC_R07_N6/VLCjetsR07N6
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R10N2 {
-	set JetInputArray FastJetFinderVLC_R10_N2/VLCjetsR10N2
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R10N2 {
-	set JetInputArray FastJetFinderVLC_R10_N2/VLCjetsR10N2
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R10N2 {
-	set JetInputArray FastJetFinderVLC_R10_N2/VLCjetsR10N2
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R10N3 {
-	set JetInputArray FastJetFinderVLC_R10_N3/VLCjetsR10N3
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R10N3 {
-	set JetInputArray FastJetFinderVLC_R10_N3/VLCjetsR10N3
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R10N3 {
-	set JetInputArray FastJetFinderVLC_R10_N3/VLCjetsR10N3
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R10N4 {
-	set JetInputArray FastJetFinderVLC_R10_N4/VLCjetsR10N4
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R10N4 {
-	set JetInputArray FastJetFinderVLC_R10_N4/VLCjetsR10N4
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R10N4 {
-	set JetInputArray FastJetFinderVLC_R10_N4/VLCjetsR10N4
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R10N5 {
-	set JetInputArray FastJetFinderVLC_R10_N5/VLCjetsR10N5
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R10N5 {
-	set JetInputArray FastJetFinderVLC_R10_N5/VLCjetsR10N5
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R10N5 {
-	set JetInputArray FastJetFinderVLC_R10_N5/VLCjetsR10N5
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R10N6 {
-	set JetInputArray FastJetFinderVLC_R10_N6/VLCjetsR10N6
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R10N6 {
-	set JetInputArray FastJetFinderVLC_R10_N6/VLCjetsR10N6
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R10N6 {
-	set JetInputArray FastJetFinderVLC_R10_N6/VLCjetsR10N6
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R12N2 {
-	set JetInputArray FastJetFinderVLC_R12_N2/VLCjetsR12N2
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R12N2 {
-	set JetInputArray FastJetFinderVLC_R12_N2/VLCjetsR12N2
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R12N2 {
-	set JetInputArray FastJetFinderVLC_R12_N2/VLCjetsR12N2
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R12N3 {
-	set JetInputArray FastJetFinderVLC_R12_N3/VLCjetsR12N3
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R12N3 {
-	set JetInputArray FastJetFinderVLC_R12_N3/VLCjetsR12N3
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R12N3 {
-	set JetInputArray FastJetFinderVLC_R12_N3/VLCjetsR12N3
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R12N4 {
-	set JetInputArray FastJetFinderVLC_R12_N4/VLCjetsR12N4
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R12N4 {
-	set JetInputArray FastJetFinderVLC_R12_N4/VLCjetsR12N4
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R12N4 {
-	set JetInputArray FastJetFinderVLC_R12_N4/VLCjetsR12N4
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R12N5 {
-	set JetInputArray FastJetFinderVLC_R12_N5/VLCjetsR12N5
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R12N5 {
-	set JetInputArray FastJetFinderVLC_R12_N5/VLCjetsR12N5
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R12N5 {
-	set JetInputArray FastJetFinderVLC_R12_N5/VLCjetsR12N5
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R12N6 {
-	set JetInputArray FastJetFinderVLC_R12_N6/VLCjetsR12N6
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R12N6 {
-	set JetInputArray FastJetFinderVLC_R12_N6/VLCjetsR12N6
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R12N6 {
-	set JetInputArray FastJetFinderVLC_R12_N6/VLCjetsR12N6
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R15N2 {
-	set JetInputArray FastJetFinderVLC_R15_N2/VLCjetsR15N2
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R15N2 {
-	set JetInputArray FastJetFinderVLC_R15_N2/VLCjetsR15N2
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R15N2 {
-	set JetInputArray FastJetFinderVLC_R15_N2/VLCjetsR15N2
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R15N3 {
-	set JetInputArray FastJetFinderVLC_R15_N3/VLCjetsR15N3
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R15N3 {
-	set JetInputArray FastJetFinderVLC_R15_N3/VLCjetsR15N3
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R15N3 {
-	set JetInputArray FastJetFinderVLC_R15_N3/VLCjetsR15N3
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R15N4 {
-	set JetInputArray FastJetFinderVLC_R15_N4/VLCjetsR15N4
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R15N4 {
-	set JetInputArray FastJetFinderVLC_R15_N4/VLCjetsR15N4
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R15N4 {
-	set JetInputArray FastJetFinderVLC_R15_N4/VLCjetsR15N4
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R15N5 {
-	set JetInputArray FastJetFinderVLC_R15_N5/VLCjetsR15N5
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R15N5 {
-	set JetInputArray FastJetFinderVLC_R15_N5/VLCjetsR15N5
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R15N5 {
-	set JetInputArray FastJetFinderVLC_R15_N5/VLCjetsR15N5
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
-module BTagging BTaggingWP50_R15N6 {
-	set JetInputArray FastJetFinderVLC_R15_N6/VLCjetsR15N6
-	set BitNumber 0
-	source CLICdet_BTag_50.tcl
-}
-module BTagging BTaggingWP70_R15N6 {
-	set JetInputArray FastJetFinderVLC_R15_N6/VLCjetsR15N6
-	set BitNumber 1
-	source CLICdet_BTag_70.tcl
-}
-module BTagging BTaggingWP90_R15N6 {
-	set JetInputArray FastJetFinderVLC_R15_N6/VLCjetsR15N6
-	set BitNumber 2
-	source CLICdet_BTag_90.tcl
-}
Index: cards/CLICdet_JetFlavorAssociation.tcl
===================================================================
--- cards/CLICdet_JetFlavorAssociation.tcl	(revision 5953e02f68d23a0304b6289edd9f0e861e0089af)
+++ 	(revision )
@@ -1,310 +1,0 @@
-module JetFlavorAssociation JetFlavorAssociation_R05N2 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R05_N2/VLCjetsR05N2
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R05N3 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R05_N3/VLCjetsR05N3
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R05N4 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R05_N4/VLCjetsR05N4
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R05N5 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R05_N5/VLCjetsR05N5
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R05N6 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R05_N6/VLCjetsR05N6
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-
-#R07
-module JetFlavorAssociation JetFlavorAssociation_R07N2 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R07_N2/VLCjetsR07N2
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R07N3 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R07_N3/VLCjetsR07N3
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R07N4 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R07_N4/VLCjetsR07N4
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R07N5 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R07_N5/VLCjetsR07N5
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R07N6 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R07_N6/VLCjetsR07N6
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-
-
-#R10
-module JetFlavorAssociation JetFlavorAssociation_R10N2 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R10_N2/VLCjetsR10N2
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R10N3 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R10_N3/VLCjetsR10N3
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R10N4 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R10_N4/VLCjetsR10N4
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R10N5 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R10_N5/VLCjetsR10N5
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R10N6 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R10_N6/VLCjetsR10N6
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-
-
-# R 12
-module JetFlavorAssociation JetFlavorAssociation_R12N2 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R12_N2/VLCjetsR12N2
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R12N3 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R12_N3/VLCjetsR12N3
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R12N4 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R12_N4/VLCjetsR12N4
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R12N5 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R12_N5/VLCjetsR12N5
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R12N6 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R12_N6/VLCjetsR12N6
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-
-# R15
-module JetFlavorAssociation JetFlavorAssociation_R15N2 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R15_N2/VLCjetsR15N2
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R15N3 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R15_N3/VLCjetsR15N3
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R15N4 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R15_N4/VLCjetsR15N4
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R15N5 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R15_N5/VLCjetsR15N5
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
-module JetFlavorAssociation JetFlavorAssociation_R15N6 {
-
-    set PartonInputArray Delphes/partons
-    set ParticleInputArray Delphes/allParticles
-    set ParticleLHEFInputArray Delphes/allParticlesLHEF
-    set JetInputArray FastJetFinderVLC_R15_N6/VLCjetsR15N6
-
-    set DeltaR 0.5
-    set PartonPTMin 1.0
-    set PartonEtaMax 2.5
-
-}
Index: cards/CLICdet_JetReco.tcl
===================================================================
--- cards/CLICdet_JetReco.tcl	(revision 5953e02f68d23a0304b6289edd9f0e861e0089af)
+++ 	(revision )
@@ -1,313 +1,0 @@
-
-############
-# Jet finder VLC
-############
-#R05 N2
-module FastJetFinder FastJetFinderVLC_R05_N2 {
-    #  set InputArray Calorimeter/towers
-    set InputArray EFlowFilter/eflow
-
-    set OutputArray VLCjetsR05N2
-
-    # algorithm: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt, 7 anti-kt with winner-take-all axis (for N-subjettiness), 8 N-jettiness, 9 Valencia
-    set NJets 2
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 0.5
-    set Beta 1.0
-    set Gamma 1.0
-
-    set JetPTMin 20.0
-}
-#R05 N3
-module FastJetFinder FastJetFinderVLC_R05_N3 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR05N3
-    set NJets 3
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 0.5
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R05 N4
-module FastJetFinder FastJetFinderVLC_R05_N4 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR05N4
-    set NJets 4
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 0.5
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R05 N5
-module FastJetFinder FastJetFinderVLC_R05_N5 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR05N5
-    set NJets 5
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 0.5
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R05 N6
-module FastJetFinder FastJetFinderVLC_R05_N6 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR05N6
-    set NJets 6
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 0.5
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R07 N2
-module FastJetFinder FastJetFinderVLC_R07_N2 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR07N2
-    set NJets 2
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 0.7
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R07 N3
-module FastJetFinder FastJetFinderVLC_R07_N3 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR07N3
-    set NJets 3
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 0.7
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R07 N4
-module FastJetFinder FastJetFinderVLC_R07_N4 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR07N4
-    set NJets 4
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 0.7
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R07 N5
-module FastJetFinder FastJetFinderVLC_R07_N5 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR07N5
-    set NJets 5
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 0.7
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R07 N6
-module FastJetFinder FastJetFinderVLC_R07_N6 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR07N6
-    set NJets 6
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 0.7
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-
-#R10N2
-module FastJetFinder FastJetFinderVLC_R10_N2 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR10N2
-    set NJets 2
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.0
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R10 N3
-module FastJetFinder FastJetFinderVLC_R10_N3 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR10N3
-    set NJets 3
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.0
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R10 N4
-module FastJetFinder FastJetFinderVLC_R10_N4 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR10N4
-    set NJets 4
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.0
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R10 N5
-module FastJetFinder FastJetFinderVLC_R10_N5 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR10N5
-    set NJets 5
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.0
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R10 N6
-module FastJetFinder FastJetFinderVLC_R10_N6 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR10N6
-    set NJets 6
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.0
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-
-#R12 N2
-module FastJetFinder FastJetFinderVLC_R12_N2 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR12N2
-    set NJets 2
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.2
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R12 N3
-module FastJetFinder FastJetFinderVLC_R12_N3 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR12N3
-    set NJets 3
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.2
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R12 N4
-module FastJetFinder FastJetFinderVLC_R12_N4 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR12N4
-    set NJets 4
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.2
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R12 N5
-module FastJetFinder FastJetFinderVLC_R12_N5 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR12N5
-    set NJets 5
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.2
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R12 N6
-module FastJetFinder FastJetFinderVLC_R12_N6 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR12N6
-    set NJets 6
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.2
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-
-
-#R15 N2
-module FastJetFinder FastJetFinderVLC_R15_N2 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR15N2
-    set NJets 2
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.5
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R15 N3
-module FastJetFinder FastJetFinderVLC_R15_N3 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR15N3
-    set NJets 3
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.5
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R15 N4
-module FastJetFinder FastJetFinderVLC_R15_N4 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR15N4
-    set NJets 4
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.5
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R15 N5
-module FastJetFinder FastJetFinderVLC_R15_N5 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR15N5
-    set NJets 5
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.5
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
-#R15 N6
-module FastJetFinder FastJetFinderVLC_R15_N6 {
-    set InputArray EFlowFilter/eflow
-    set OutputArray VLCjetsR15N6
-    set NJets 6
-    set ExclusiveClustering true
-    set JetAlgorithm 9
-    set ParameterR 1.5
-    set Beta 1.0
-    set Gamma 1.0
-    set JetPTMin 20.0
-}
Index: cards/delphes_card_CLICdet.tcl
===================================================================
--- cards/delphes_card_CLICdet.tcl	(revision 5953e02f68d23a0304b6289edd9f0e861e0089af)
+++ cards/delphes_card_CLICdet.tcl	(revision 5554fa9666ccad7ce69d6fb2661da9aa124449e5)
@@ -228,10 +228,10 @@
 
     set EfficiencyFormula {
-(abs(eta) > 2.54) * (0.000) +
-(energy >= 100) * (abs(eta) < 2.54)  * (1.000) +
-(energy < 100 && energy >= 10) * (abs(eta) <=2.54 && abs(eta) > 2.34)  * (0.994) +
-(energy < 100 && energy >= 10) * (abs(eta) <= 2.34) * (1.000) +
-(energy < 10  && energy >= 1) * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.000) +
-(energy < 10  && energy >= 1) * (abs(eta) <= 0.55 ) * (1.000) 
+	(abs(eta) > 2.54) * (0.000) +
+	(energy >= 100) * (abs(eta) < 2.54)  * (1.000) +
+	(energy < 100 && energy >= 10) * (abs(eta) <=2.54 && abs(eta) > 2.34)  * (0.994) +
+	(energy < 100 && energy >= 10) * (abs(eta) <= 2.34) * (1.000) +
+	(energy < 10  && energy >= 1) * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.000) +
+	(energy < 10  && energy >= 1) * (abs(eta) <= 0.55 ) * (1.000) 
     }
 }
@@ -248,15 +248,15 @@
     # Current full simulation with CLICdet provides for electrons:
     set EfficiencyFormula {
-		(pt <= 1)                                                               * (0.000) +
-		(abs(eta) > 2.54)                                                       * (0.000) +
-		(energy > 100)                 * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) +
-		(energy > 100)                 * (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) +
-		(energy > 100)                 * (abs(eta) <= 2.34  )                   * (1.000) +
-		(energy <= 100 && energy > 10) * (abs(eta) <= 2.54 && abs(eta) > 2.17 ) * (0.998) +
-		(energy <= 100 && energy > 10) * (abs(eta) <= 2.17)                     * (1.000) +
-		(energy <= 10 && energy > 1)   * (abs(eta) > 2.34 )                     * (0.000) +
-		(energy <= 10 && energy > 1)   * (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) +
-		(energy <= 10 && energy > 1)   * (abs(eta) <= 0.76)                     * (0.999)
-     }
+	(pt <= 1)                                                               * (0.000) +
+	(abs(eta) > 2.54)                                                       * (0.000) +
+	(energy > 100)                 * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) +
+	(energy > 100)                 * (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) +
+	(energy > 100)                 * (abs(eta) <= 2.34  )                   * (1.000) +
+	(energy <= 100 && energy > 10) * (abs(eta) <= 2.54 && abs(eta) > 2.17 ) * (0.998) +
+	(energy <= 100 && energy > 10) * (abs(eta) <= 2.17)                     * (1.000) +
+	(energy <= 10 && energy > 1)   * (abs(eta) > 2.34 )                     * (0.000) +
+	(energy <= 10 && energy > 1)   * (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) +
+	(energy <= 10 && energy > 1)   * (abs(eta) <= 0.76)                     * (0.999)
+    }
 }
 
@@ -292,4 +292,5 @@
 
     # Resolution given in dpT/pT.
+    # CLICdet internal studies
     set ResolutionFormula {
 	(abs(eta) < 2.66 && abs(eta) >= 2.03 ) * sqrt( 8.56036e-05^2 * pt^2 +0.0148987^2    ) +
@@ -311,4 +312,5 @@
 
     # Resolution given in dpT/pT.
+    # CLICdet internal studies
     set ResolutionFormula {
 	(abs(eta) < 2.66 && abs(eta) >= 2.03 ) * sqrt( 8.62283e-05^2 * pt^2  + 0.0177556^2   ) +
@@ -330,4 +332,6 @@
 
     # Resolution given in dpT/pT.
+
+    # CLICdet internal studies
     set ResolutionFormula {
 
@@ -455,5 +459,5 @@
 
     # set ECalResolutionFormula {resolution formula as a function of eta and energy}
-
+    # not from CLICdet
     set ResolutionFormula { (abs(eta) <= 3.0)                   * sqrt(energy^2*0.01^2 + energy*0.15^2) }
 
@@ -542,9 +546,8 @@
 
     # set HCalResolutionFormula {resolution formula as a function of eta and energy}
-
-	# set ResolutionFormula {                  (abs(eta) <= 3.0) * sqrt(energy^2*0.015^2 + energy*0.50^2)}
-	set ResolutionFormula { (abs(eta)< 0.8) * sqrt(1.48^2  + 0.251^2*energy  + 0.0537^2*energy^2) +
+    #CLICdet internal studies
+    set ResolutionFormula { (abs(eta)< 0.8) * sqrt(1.48^2  + 0.251^2*energy  + 0.0537^2*energy^2) +
 	(abs(eta)>= 0.8 && abs(eta)<=3) * sqrt( 1.09^2 + 0.321^2*energy + 0.0517^2*energy^2  )}
-
+    
 }
 
@@ -601,5 +604,4 @@
 }
 
-##here
 
 ###################
@@ -614,15 +616,7 @@
 
     # efficiency formula for photons
-	# including converted photons
-	#0.94 for |costheta| < 0.6, i.e. |eta|< 0.7
-	#0.9 for |costheta| > 0.6, i.e. |eta|>0.7 but smaller than 3
-
-
+    # current full simulation of CLICdet yields:
 	set EfficiencyFormula {(abs(eta) < 0.7)*(0.94) + (abs(eta) >=0.7 && abs(eta) <=3.0) * (0.9)	}
-	#old:
-    #set EfficiencyFormula {                                      (pt <= 10.0) * (0.00) +
-	#(abs(eta) <= 1.5) * (pt > 10.0)  * (0.95) +
-	#(abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0)  * (0.95) +
-	#(abs(eta) > 2.5)                                   * (0.00)}
+
 }
 
@@ -691,11 +685,6 @@
 
     # efficiency formula for muons
+    # current full simulation of CLICdet yields:
 	set EfficiencyFormula {(energy  < 50 )*(0.98) + (energy>=50) *(0.999)}
-    #set EfficiencyFormula {                                      (pt <= 10.0)               * (0.00) +
-	#(abs(eta) <= 1.5) * (pt > 10.0 && pt <= 1.0e3) * (0.95) +
-	#(abs(eta) <= 1.5) * (pt > 1.0e3)               * (0.95 * exp(0.5 - pt*5.0e-4)) +
-	#(abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 10.0 && pt <= 1.0e3) * (0.95) +
-	#(abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 1.0e3)               * (0.95 * exp(0.5 - pt*5.0e-4)) +
-	#(abs(eta) > 2.4)                                                 * (0.00)}
 }
 
@@ -749,16 +738,4 @@
 }
 
-
-#
-#module PdgCodeFilter EFlowFilter {
-#    set InputArray EFlowMerger/eflow
-#    set OutputArray eflow
-#    
-#    add PdgCode {11}
-#    add PdgCode {-11}
-#    add PdgCode {13}
-#    add PdgCode {-13}
-#}
-
 #################
 # Neutrino Filter
@@ -827,5 +804,5 @@
 }
 
-source CLICdet_JetReco.tcl
+source CLICdet/CLICdet_JetReco.tcl
 
 
@@ -847,5 +824,5 @@
 ########################
 
-source CLICdet_JetFlavorAssociation.tcl
+source  CLICdet/CLICdet_JetFlavorAssociation.tcl
 
 ###########
@@ -854,5 +831,5 @@
 # based on CLICdp-Note-2014-002    
 
-source CLICdet_BTagging.tcl
+source  CLICdet/CLICdet_BTagging.tcl
 
 
