@@ -190,35 +190,49 @@ struct CreateEMEventDilepton {
190190
191191 float q2xft0m = 999 .f , q2yft0m = 999 .f , q2xft0a = 999 .f , q2yft0a = 999 .f , q2xft0c = 999 .f , q2yft0c = 999 .f , q2xbpos = 999 .f , q2ybpos = 999 .f , q2xbneg = 999 .f , q2ybneg = 999 .f , q2xbtot = 999 .f , q2ybtot = 999 .f ;
192192 float q3xft0m = 999 .f , q3yft0m = 999 .f , q3xft0a = 999 .f , q3yft0a = 999 .f , q3xft0c = 999 .f , q3yft0c = 999 .f , q3xbpos = 999 .f , q3ybpos = 999 .f , q3xbneg = 999 .f , q3ybneg = 999 .f , q3xbtot = 999 .f , q3ybtot = 999 .f ;
193+ float q4xft0m = 999 .f , q4yft0m = 999 .f , q4xft0a = 999 .f , q4yft0a = 999 .f , q4xft0c = 999 .f , q4yft0c = 999 .f , q4xbpos = 999 .f , q4ybpos = 999 .f , q4xbneg = 999 .f , q4ybneg = 999 .f , q4xbtot = 999 .f , q4ybtot = 999 .f ;
193194
194195 if constexpr (eventype == EMEventType::kEvent ) {
195196 event_cent (105 .f , 105 .f , 105 .f , 105 .f );
196- event_qvec (q2xft0m, q2yft0m, q2xft0a, q2yft0a, q2xft0c, q2yft0c, q2xbpos, q2ybpos, q2xbneg, q2ybneg, q2xbtot, q2ybtot, q3xft0m, q3yft0m, q3xft0a, q3yft0a, q3xft0c, q3yft0c, q3xbpos, q3ybpos, q3xbneg, q3ybneg, q3xbtot, q3ybtot);
197+ event_qvec (
198+ q2xft0m, q2yft0m, q2xft0a, q2yft0a, q2xft0c, q2yft0c, q2xbpos, q2ybpos, q2xbneg, q2ybneg, q2xbtot, q2ybtot,
199+ q3xft0m, q3yft0m, q3xft0a, q3yft0a, q3xft0c, q3yft0c, q3xbpos, q3ybpos, q3xbneg, q3ybneg, q3xbtot, q3ybtot,
200+ q4xft0m, q4yft0m, q4xft0a, q4yft0a, q4xft0c, q4yft0c, q4xbpos, q4ybpos, q4xbneg, q4ybneg, q4xbtot, q4ybtot);
197201 } else if constexpr (eventype == EMEventType::kEvent_Cent ) {
198202 event_cent (collision.centFT0M (), collision.centFT0A (), collision.centFT0C (), collision.centNTPV ());
199- event_qvec (q2xft0m, q2yft0m, q2xft0a, q2yft0a, q2xft0c, q2yft0c, q2xbpos, q2ybpos, q2xbneg, q2ybneg, q2xbtot, q2ybtot, q3xft0m, q3yft0m, q3xft0a, q3yft0a, q3xft0c, q3yft0c, q3xbpos, q3ybpos, q3xbneg, q3ybneg, q3xbtot, q3ybtot);
203+ event_qvec (
204+ q2xft0m, q2yft0m, q2xft0a, q2yft0a, q2xft0c, q2yft0c, q2xbpos, q2ybpos, q2xbneg, q2ybneg, q2xbtot, q2ybtot,
205+ q3xft0m, q3yft0m, q3xft0a, q3yft0a, q3xft0c, q3yft0c, q3xbpos, q3ybpos, q3xbneg, q3ybneg, q3xbtot, q3ybtot,
206+ q4xft0m, q4yft0m, q4xft0a, q4yft0a, q4xft0c, q4yft0c, q4xbpos, q4ybpos, q4xbneg, q4ybneg, q4xbtot, q4ybtot);
200207 } else if constexpr (eventype == EMEventType::kEvent_Cent_Qvec ) {
201208 event_cent (collision.centFT0M (), collision.centFT0A (), collision.centFT0C (), collision.centNTPV ());
202209
203- // std::vector<float> qvec;
204- // std::copy(collision.qvecFT0MReVec().begin(), collision.qvecFT0MReVec().end(), std::back_inserter(qvec));
205- // LOGF(info, "qvec.at(0) = %f", qvec.at(0));
206-
207- // LOGF(info, "collision.qvecFT0MReVec()[0] = %f, collision.qvecFT0MImVec()[0] = %f, collision.qvecFT0MReVec()[1] = %f, collision.qvecFT0MImVec()[1] = %f", collision.qvecFT0MReVec()[0], collision.qvecFT0MImVec()[0], collision.qvecFT0MReVec()[1], collision.qvecFT0MImVec()[1]);
208-
209- if (collision.qvecFT0CReVec ().size () >= 2 ) { // both harmonics 2,3
210+ if (collision.qvecFT0CReVec ().size () >= 3 ) { // harmonics 2,3,4
211+ q2xft0m = collision.qvecFT0MReVec ()[0 ], q2xft0a = collision.qvecFT0AReVec ()[0 ], q2xft0c = collision.qvecFT0CReVec ()[0 ], q2xbpos = collision.qvecBPosReVec ()[0 ], q2xbneg = collision.qvecBNegReVec ()[0 ], q2xbtot = collision.qvecBTotReVec ()[0 ];
212+ q2yft0m = collision.qvecFT0MImVec ()[0 ], q2yft0a = collision.qvecFT0AImVec ()[0 ], q2yft0c = collision.qvecFT0CImVec ()[0 ], q2ybpos = collision.qvecBPosImVec ()[0 ], q2ybneg = collision.qvecBNegImVec ()[0 ], q2ybtot = collision.qvecBTotImVec ()[0 ];
213+ q3xft0m = collision.qvecFT0MReVec ()[1 ], q3xft0a = collision.qvecFT0AReVec ()[1 ], q3xft0c = collision.qvecFT0CReVec ()[1 ], q3xbpos = collision.qvecBPosReVec ()[1 ], q3xbneg = collision.qvecBNegReVec ()[1 ], q3xbtot = collision.qvecBTotReVec ()[1 ];
214+ q3yft0m = collision.qvecFT0MImVec ()[1 ], q3yft0a = collision.qvecFT0AImVec ()[1 ], q3yft0c = collision.qvecFT0CImVec ()[1 ], q3ybpos = collision.qvecBPosImVec ()[1 ], q3ybneg = collision.qvecBNegImVec ()[1 ], q3ybtot = collision.qvecBTotImVec ()[1 ];
215+ q4xft0m = collision.qvecFT0MReVec ()[2 ], q4xft0a = collision.qvecFT0AReVec ()[2 ], q4xft0c = collision.qvecFT0CReVec ()[2 ], q4xbpos = collision.qvecBPosReVec ()[2 ], q4xbneg = collision.qvecBNegReVec ()[2 ], q4xbtot = collision.qvecBTotReVec ()[2 ];
216+ q4yft0m = collision.qvecFT0MImVec ()[2 ], q4yft0a = collision.qvecFT0AImVec ()[2 ], q4yft0c = collision.qvecFT0CImVec ()[2 ], q4ybpos = collision.qvecBPosImVec ()[2 ], q4ybneg = collision.qvecBNegImVec ()[2 ], q4ybtot = collision.qvecBTotImVec ()[2 ];
217+ } else if (collision.qvecFT0CReVec ().size () >= 2 ) { // harmonics 2,3
210218 q2xft0m = collision.qvecFT0MReVec ()[0 ], q2xft0a = collision.qvecFT0AReVec ()[0 ], q2xft0c = collision.qvecFT0CReVec ()[0 ], q2xbpos = collision.qvecBPosReVec ()[0 ], q2xbneg = collision.qvecBNegReVec ()[0 ], q2xbtot = collision.qvecBTotReVec ()[0 ];
211219 q2yft0m = collision.qvecFT0MImVec ()[0 ], q2yft0a = collision.qvecFT0AImVec ()[0 ], q2yft0c = collision.qvecFT0CImVec ()[0 ], q2ybpos = collision.qvecBPosImVec ()[0 ], q2ybneg = collision.qvecBNegImVec ()[0 ], q2ybtot = collision.qvecBTotImVec ()[0 ];
212220 q3xft0m = collision.qvecFT0MReVec ()[1 ], q3xft0a = collision.qvecFT0AReVec ()[1 ], q3xft0c = collision.qvecFT0CReVec ()[1 ], q3xbpos = collision.qvecBPosReVec ()[1 ], q3xbneg = collision.qvecBNegReVec ()[1 ], q3xbtot = collision.qvecBTotReVec ()[1 ];
213221 q3yft0m = collision.qvecFT0MImVec ()[1 ], q3yft0a = collision.qvecFT0AImVec ()[1 ], q3yft0c = collision.qvecFT0CImVec ()[1 ], q3ybpos = collision.qvecBPosImVec ()[1 ], q3ybneg = collision.qvecBNegImVec ()[1 ], q3ybtot = collision.qvecBTotImVec ()[1 ];
214- } else if (collision.qvecFT0CReVec ().size () >= 1 ) { // only harmonics 2
222+ } else if (collision.qvecFT0CReVec ().size () >= 1 ) { // harmonics 2
215223 q2xft0m = collision.qvecFT0MReVec ()[0 ], q2xft0a = collision.qvecFT0AReVec ()[0 ], q2xft0c = collision.qvecFT0CReVec ()[0 ], q2xbpos = collision.qvecBPosReVec ()[0 ], q2xbneg = collision.qvecBNegReVec ()[0 ], q2xbtot = collision.qvecBTotReVec ()[0 ];
216224 q2yft0m = collision.qvecFT0MImVec ()[0 ], q2yft0a = collision.qvecFT0AImVec ()[0 ], q2yft0c = collision.qvecFT0CImVec ()[0 ], q2ybpos = collision.qvecBPosImVec ()[0 ], q2ybneg = collision.qvecBNegImVec ()[0 ], q2ybtot = collision.qvecBTotImVec ()[0 ];
217225 }
218- event_qvec (q2xft0m, q2yft0m, q2xft0a, q2yft0a, q2xft0c, q2yft0c, q2xbpos, q2ybpos, q2xbneg, q2ybneg, q2xbtot, q2ybtot, q3xft0m, q3yft0m, q3xft0a, q3yft0a, q3xft0c, q3yft0c, q3xbpos, q3ybpos, q3xbneg, q3ybneg, q3xbtot, q3ybtot);
226+ event_qvec (
227+ q2xft0m, q2yft0m, q2xft0a, q2yft0a, q2xft0c, q2yft0c, q2xbpos, q2ybpos, q2xbneg, q2ybneg, q2xbtot, q2ybtot,
228+ q3xft0m, q3yft0m, q3xft0a, q3yft0a, q3xft0c, q3yft0c, q3xbpos, q3ybpos, q3xbneg, q3ybneg, q3xbtot, q3ybtot,
229+ q4xft0m, q4yft0m, q4xft0a, q4yft0a, q4xft0c, q4yft0c, q4xbpos, q4ybpos, q4xbneg, q4ybneg, q4xbtot, q4ybtot);
219230 } else {
220231 event_cent (105 .f , 105 .f , 105 .f , 105 .f );
221- event_qvec (q2xft0m, q2yft0m, q2xft0a, q2yft0a, q2xft0c, q2yft0c, q2xbpos, q2ybpos, q2xbneg, q2ybneg, q2xbtot, q2ybtot, q3xft0m, q3yft0m, q3xft0a, q3yft0a, q3xft0c, q3yft0c, q3xbpos, q3ybpos, q3xbneg, q3ybneg, q3xbtot, q3ybtot);
232+ event_qvec (
233+ q2xft0m, q2yft0m, q2xft0a, q2yft0a, q2xft0c, q2yft0c, q2xbpos, q2ybpos, q2xbneg, q2ybneg, q2xbtot, q2ybtot,
234+ q3xft0m, q3yft0m, q3xft0a, q3yft0a, q3xft0c, q3yft0c, q3xbpos, q3ybpos, q3xbneg, q3ybneg, q3xbtot, q3ybtot,
235+ q4xft0m, q4yft0m, q4xft0a, q4yft0a, q4xft0c, q4yft0c, q4xbpos, q4ybpos, q4xbneg, q4ybneg, q4xbtot, q4ybtot);
222236 }
223237 } // end of collision loop
224238 } // end of skimEvent
0 commit comments