From 05a395f9e77e8f49bfc4ad130b577af9eee68bd0 Mon Sep 17 00:00:00 2001 From: Junqi Xie <jxie@anl.gov> Date: Thu, 26 Mar 2020 17:14:04 -0500 Subject: [PATCH] try merge request --- .DS_Store | Bin 0 -> 6148 bytes src/.DS_Store | Bin 0 -> 6148 bytes src/GenericDetectors/.DS_Store | Bin 0 -> 6148 bytes src/GenericDetectors/pid/.DS_Store | Bin 0 -> 6148 bytes src/GenericDetectors/pid/src/GenericRICH_geo.cpp | 3 +++ 5 files changed, 3 insertions(+) create mode 100644 .DS_Store create mode 100644 src/.DS_Store create mode 100644 src/GenericDetectors/.DS_Store create mode 100644 src/GenericDetectors/pid/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..76501755eefd07467416fae42cdbeeeaeb0f6126 GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zj35RBCIAV8Fop~hR0Kpbg3Kr`NXp4iVqjo6kyHSc z8|)Ow?aU0t3`GpdN#)4y&&ez<F)+B!$i&RT%Er#Y$;rXV%NZM-kzXEMl2}q&?37p( z4dMkPmSiMB*&+G)IdFDjQdnkcdAxv#bADb)VrE`y5lDG(W=d*OVo^+ZW?o8uxl?{= zUP>|89H<1?qId!E>S}WX9R))R!&)7MYI7q?9R*W!v)Wot4slgOThD~t%Bt#`+PWE# z;ALcl&<y-g8b-}zU|@jyt}M7HFDE}Q9TfL4=}~$#1V%$(Gz3ONU_^!hwASF@9+AEu z_4H^6jD`Td5CD}A3efhV1C(xn&>$%WMg|5@^BF|5z{~;n10ZTZT0wFktsoktm4Ok& z0?UK7GB7egv@(LbAq)(R;4TS>25V<vWB_YtU}OMmXMi<z86nyk7$MpjV4W96P>%*= zK14eMBSbsQd871b2#kgRGz6F-v;e67cV&QQA&BTGIT`|^Auu9BfRV)|*u@D{Y2xrM zsICRorwLGbQ0)(?jzJYQY9oLNGN32{RSK%^L0UmHxGH93fYjup4FOmPjnbnbK>rW` E0D!emrvLx| literal 0 HcmV?d00001 diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ff3c32709a001543bae818f842a0f83f8dc30add GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zOq>i@0Z1N%F(jFwA|RR(Y(^17CPOlV3qvYH2~=*B z8r&fOiaP-YcZO7kJcd*T<oHWvNM<Nu$Y&^GC{8LbE=bDBPhwzTIFVG4lUZD1U~rw0 ziJ66!jh%y&lY^6&Gd4IQzdX1kv81%vDX}OT#0y9)$w-2-L-O-;;OxYtu*}r*cmWaT z{JfIH%)Hbhkn-Tnl+>ieqL}c^yp;TMr~J~qlwz<sPzkU_@dD!2)#e5|3WgSjwK@vb z=0=t}3Z~{}wY8ia;;M$Wo(Z{?Rn;}Mbu%Er&d3O%8Tg?zjG75f^aT7}7F?8<lb@Fk z$}cdDqx5J9jE2By2n>S|fR>FM+{3^xqh1&dfzc44ZU}(N2L))`#{o(=KxmK@10w?i zsQCz@SztCp`T-0eF_2ae4blptL0TCYK`gKtV66;{3=pl1;BE*=AE-+LqQTl37#YCY z85kMB+8JOCI!1_g21bZ>21aNPg%P5iff1seff1q|=DbmQGz3ON02%_!5Ly6K|GP3U z;OhTFRE?6OAut*O!!iUISzLl$oWPYbcK?CuT2OtO0F?&S{-ElZ5mZkj#K2WC6J$V9 h0xAru?m=2XG`K2eWPsG<qYVLA2#wOCAwd5S008|VSVsT= literal 0 HcmV?d00001 diff --git a/src/GenericDetectors/.DS_Store b/src/GenericDetectors/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f91d7298a61575c1d5935b9ec83d264889f77c7c GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zj35RBCIAV8Fop~hR0Kpbg3Kr`NXp4iVqjo6kyHSc z8|)Ow?aT}X44DimN#)4y&&ez<F)+B!$i&RT%Er#Y$;rXV%NZM-kzXEMl2}q&?37p( z4dMkPmSiMB*&+G)IdFDjQdnkcdAxv#bADb)VrE`y5lDG(W=d*OVo^+ZW?o8uxl?{= zUP>|89H<1?qId!E>S}WX9R))R!&)7MYI7q?9R*W!v)Wot4slgOThD~t%Bt#`+PWE# z;ALcl&<y-g8b-}zU|@jyt}M7HFDE}Q9TfL4=}~$#1V%$(Gz3ONU_^!hwASF@9+AEu z_4H^6jD`Td5CD}A3efhV1C(xn&>$%WMg|5@^BF|5z{~;n10ZTZT0wFktsoktm4Ok& z0?UK7GB7egv@(LbAq)(R;4TS>25V<vWB_YtU}OMmXMi<z86nyk7$MpjV4W96P>%*= zK14eMBSbsQd871b2#kgRGz6F-v;e67cV&QQA&BTGIT`|^Auu9BfRV)|*u@D{Y2xrM zsICRorwLGbQ0)(?jzJYQY9oLNGN32{RSK%^L0UmHxGH93fYjup4FOmPjnbnbK>rW` E0FhfykpKVy literal 0 HcmV?d00001 diff --git a/src/GenericDetectors/pid/.DS_Store b/src/GenericDetectors/pid/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..76501755eefd07467416fae42cdbeeeaeb0f6126 GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zj35RBCIAV8Fop~hR0Kpbg3Kr`NXp4iVqjo6kyHSc z8|)Ow?aU0t3`GpdN#)4y&&ez<F)+B!$i&RT%Er#Y$;rXV%NZM-kzXEMl2}q&?37p( z4dMkPmSiMB*&+G)IdFDjQdnkcdAxv#bADb)VrE`y5lDG(W=d*OVo^+ZW?o8uxl?{= zUP>|89H<1?qId!E>S}WX9R))R!&)7MYI7q?9R*W!v)Wot4slgOThD~t%Bt#`+PWE# z;ALcl&<y-g8b-}zU|@jyt}M7HFDE}Q9TfL4=}~$#1V%$(Gz3ONU_^!hwASF@9+AEu z_4H^6jD`Td5CD}A3efhV1C(xn&>$%WMg|5@^BF|5z{~;n10ZTZT0wFktsoktm4Ok& z0?UK7GB7egv@(LbAq)(R;4TS>25V<vWB_YtU}OMmXMi<z86nyk7$MpjV4W96P>%*= zK14eMBSbsQd871b2#kgRGz6F-v;e67cV&QQA&BTGIT`|^Auu9BfRV)|*u@D{Y2xrM zsICRorwLGbQ0)(?jzJYQY9oLNGN32{RSK%^L0UmHxGH93fYjup4FOmPjnbnbK>rW` E0D!emrvLx| literal 0 HcmV?d00001 diff --git a/src/GenericDetectors/pid/src/GenericRICH_geo.cpp b/src/GenericDetectors/pid/src/GenericRICH_geo.cpp index 2a287295..aed6f53e 100644 --- a/src/GenericDetectors/pid/src/GenericRICH_geo.cpp +++ b/src/GenericDetectors/pid/src/GenericRICH_geo.cpp @@ -1,3 +1,6 @@ +// Make a test for merge request + +#include "DD4hep/DetFactoryHelper.h" #include "DD4hep/DetFactoryHelper.h" #include "DD4hep/Printout.h" #include <XML/Helper.h> -- GitLab