diff --git a/macros/CCEScan/Hamburg.C b/macros/CCEScan/Hamburg.C
index fa19c12..f11231e 100755
--- a/macros/CCEScan/Hamburg.C
+++ b/macros/CCEScan/Hamburg.C
@@ -104,9 +104,14 @@
 
   TString det("TT");
   TString lay("TTaU");
-  double radius = -1000.0;
+  // double radius = -1000.0;
   int sector = 2634;
- 
+  // Elena - implement circular crowns
+  double radius  = -10.0;
+  double radmin = 0.0;
+  double radmax = 2000.0;
+  bool useRadius = false;
+
   
   
   for (int i=1; i<argc; i++) {
@@ -116,6 +121,7 @@
       lay = argv[++i];
     }else if (strcmp(argv[i],"-r")==0 && i+1<argc) {
       radius = std::atof(argv[++i]);
+      useRadius = true;
     }else if (strcmp(argv[i],"-s")==0 && i+1<argc) {
       sector = std::atoi(argv[++i]);
     }
@@ -125,7 +131,7 @@
   TString vn_output = TString::Format("v_Hamburg_%s_%d",
                                       lay.Data(),sector);
   
-  if (radius>0.0) {
+  if (useRadius) {
     vn_output += Form("_r%d",(int)radius);
   }
   
@@ -212,36 +218,36 @@
   TString vn_flux13_v("v_flux13_v_");
   TString vn_flux13_e("v_flux13_e_");
   
-  vn_sector   += lay.Data();
-  vn_flux7_v  += lay.Data();
-  vn_flux7_e  += lay.Data();
-  vn_flux8_v  += lay.Data();
-  vn_flux8_e  += lay.Data();
+  vn_sector    += lay.Data();
+  vn_flux7_v   += lay.Data();
+  vn_flux7_e   += lay.Data();
+  vn_flux8_v   += lay.Data();
+  vn_flux8_e   += lay.Data();
   vn_flux13_v  += lay.Data();
   vn_flux13_e  += lay.Data();
   
+  /*------------ Elena: let's use radii also for the IT
   // Add radius postfix
   if (det.EqualTo("IT")) {
     
   }else{
-    if (radius>0.0) {
-      vn_sector   += Form("_r%d",(int)radius);
-      vn_flux7_v  += Form("_r%d",(int)radius);
-      vn_flux7_e  += Form("_r%d",(int)radius);
-      vn_flux8_v  += Form("_r%d",(int)radius);
-      vn_flux8_e  += Form("_r%d",(int)radius);
-      vn_flux13_v  += Form("_r%d",(int)radius);
-      vn_flux13_e  += Form("_r%d",(int)radius);
-    }
+  */
+  if (radius>0.0) {
+    vn_sector    += Form("_r%d",(int)radius);
+    vn_flux7_v   += Form("_r%d",(int)radius);
+    vn_flux7_e   += Form("_r%d",(int)radius);
+    vn_flux8_v   += Form("_r%d",(int)radius);
+    vn_flux8_e   += Form("_r%d",(int)radius);
+    vn_flux13_v  += Form("_r%d",(int)radius);
+    vn_flux13_e  += Form("_r%d",(int)radius);
   }
+  // } end of "if not IT" block
   
-  
-  
-  TVectorD* vp_sector   = (TVectorD*)f_sector->Get(vn_sector.Data());
-  TVectorD* vp_flux7_v  = (TVectorD*)f_sector->Get(vn_flux7_v.Data());
-  TVectorD* vp_flux7_e  = (TVectorD*)f_sector->Get(vn_flux7_e.Data());
-  TVectorD* vp_flux8_v  = (TVectorD*)f_sector->Get(vn_flux8_v.Data());
-  TVectorD* vp_flux8_e  = (TVectorD*)f_sector->Get(vn_flux8_e.Data());
+  TVectorD* vp_sector    = (TVectorD*)f_sector->Get(vn_sector.Data());
+  TVectorD* vp_flux7_v   = (TVectorD*)f_sector->Get(vn_flux7_v.Data());
+  TVectorD* vp_flux7_e   = (TVectorD*)f_sector->Get(vn_flux7_e.Data());
+  TVectorD* vp_flux8_v   = (TVectorD*)f_sector->Get(vn_flux8_v.Data());
+  TVectorD* vp_flux8_e   = (TVectorD*)f_sector->Get(vn_flux8_e.Data());
   TVectorD* vp_flux13_v  = (TVectorD*)f_sector->Get(vn_flux13_v.Data());
   TVectorD* vp_flux13_e  = (TVectorD*)f_sector->Get(vn_flux13_e.Data());
 
@@ -250,11 +256,11 @@
     return EXIT_FAILURE;
   }
   
-  TVectorD v_sector   = *vp_sector;
-  TVectorD v_flux7_v  = *vp_flux7_v;
-  TVectorD v_flux7_e  = *vp_flux7_e;
-  TVectorD v_flux8_v  = *vp_flux8_v;
-  TVectorD v_flux8_e  = *vp_flux8_e;
+  TVectorD v_sector    = *vp_sector;
+  TVectorD v_flux7_v   = *vp_flux7_v;
+  TVectorD v_flux7_e   = *vp_flux7_e;
+  TVectorD v_flux8_v   = *vp_flux8_v;
+  TVectorD v_flux8_e   = *vp_flux8_e;
   TVectorD v_flux13_v  = *vp_flux13_v;
   TVectorD v_flux13_e  = *vp_flux13_e;
   
@@ -317,6 +323,7 @@
       v_fluxUnce7.push_back(flux7_e*gRandom->Gaus());
       v_fluxUnce8.push_back(flux8_e*gRandom->Gaus());
       v_fluxUnce13.push_back(flux13_e*gRandom->Gaus());
+      // Elena: why?! This can be negative...
       v_tempUnce.push_back(temp_e*(2.0*gRandom->Uniform()-1.0));
     }
     v_deltaV.push_back(0.0);