Changeset 494 in svn for trunk/Delphes.cpp

Timestamp:

Jul 16, 2009, 1:10:08 AM (15 years ago)

Author:

Xavier Rouby

Message:

new: calorimeter endcaps

File:

• trunk/Delphes.cpp (modified) (2 diffs)

trunk/Delphes.cpp

@@ -166 +166 @@
   DET->ReadParticleDataGroupTable();
   //DET->PDGtable.print();
- 
+
   //Trigger information
   cout <<"**        ########### Start reading TRIGGER card ##########        **"<< endl;
@@ -307 +307 @@
                             -DET->CEN_max_calo_cen, DET->CEN_max_calo_cen,
                             DET->ELG_Ccen,  DET->ELG_Ncen,  DET->ELG_Scen,
-                            DET->HAD_Chcal, DET->HAD_Nhcal, DET->HAD_Shcal);
+                            DET->HAD_Ccen,  DET->HAD_Ncen,  DET->HAD_Scen);
+  D_CaloElement ForwardECCalo("forwardendcapcalo",
+                            DET->CEN_max_calo_cen, DET->CEN_max_calo_ec,
+                            DET->ELG_Cec, DET->ELG_Nec, DET->ELG_Sec,
+                            DET->HAD_Cec, DET->HAD_Nec, DET->HAD_Sec );
+  D_CaloElement BackwardECCalo("backwardendcapcalo",
+                            -DET->CEN_max_calo_ec, -DET->CEN_max_calo_cen,
+                            DET->ELG_Cec, DET->ELG_Nec, DET->ELG_Sec,
+                            DET->HAD_Cec, DET->HAD_Nec, DET->HAD_Sec );
   D_CaloElement ForwardCalo("forwardcalo",
-                            DET->CEN_max_calo_cen, DET->CEN_max_calo_fwd, 
+                            DET->CEN_max_calo_ec, DET->CEN_max_calo_fwd, 
                             DET->ELG_Cfwd,  DET->ELG_Nfwd,  DET->ELG_Sfwd,
-                            DET->HAD_Chf,   DET->HAD_Nhf,   DET->HAD_Shf  );
+                            DET->HAD_Cfwd,  DET->HAD_Nfwd,  DET->HAD_Sfwd  );
   D_CaloElement BackwardCalo("backwardcalo",
-                             -DET->CEN_max_calo_fwd, -DET->CEN_max_calo_cen,
+                             -DET->CEN_max_calo_fwd, -DET->CEN_max_calo_ec,
                              DET->ELG_Cfwd,  DET->ELG_Nfwd,  DET->ELG_Sfwd,
-                             DET->HAD_Chf,   DET->HAD_Nhf,   DET->HAD_Shf  );
+                             DET->HAD_Cfwd,  DET->HAD_Nfwd,  DET->HAD_Sfwd  );
   //D_CaloElement CastorCalo("castor",5.5,6.6,1,0,0,1,0,0);
   list_of_calorimeters.addElement(CentralCalo);
+  list_of_calorimeters.addElement(ForwardECCalo);
   list_of_calorimeters.addElement(ForwardCalo);
+  list_of_calorimeters.addElement(BackwardECCalo);
   list_of_calorimeters.addElement(BackwardCalo);
   //list_of_calorimeters.addElement(CastorCalo);