use image_file_name without .png if present

brainio_collection/lookup.csv

@@ -1,12 +1,12 @@
 identifier,lookup_type,class,location_type,location,sha1,stimulus_set_identifier
-dicarlo.hvm,stimulus_set,StimulusSet,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm.csv,6c5bbadbca9ab37c7ccb7e8991c3acde0e58055a,
-dicarlo.hvm,stimulus_set,,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm.zip,355b9e5986b085ef669ea16c21b348d5b023fd9e,
+dicarlo.hvm,stimulus_set,StimulusSet,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm.csv,a56f55205904d5fb5ead4d0dc7bfad5cc4083b94,
+dicarlo.hvm,stimulus_set,,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm.zip,6fd5080deccfb061699909ffcb86a26209516811,
 gallant.David2004,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_gallant_David2004.csv,8ec76338b998cadcdf1e57edd2dd992e2ab2355b,
 gallant.David2004,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_gallant_David2004.zip,0200421d66a0613946d39cab64c00b561160016e,
 tolias.Cadena2017,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_tolias_Cadena2017.csv,f55b174cc4540e5612cfba5e695324328064b051,
 tolias.Cadena2017,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_tolias_Cadena2017.zip,88cc2ce3ef5e197ffd1477144a2e6a68d424ef6c,
-movshon.FreemanZiemba2013,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013.csv,0d2fae0b1be1b69644d6431183945a875ff0d2ba,
-movshon.FreemanZiemba2013,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013.zip,f103526e55481e692c7db64e2c59cf5020694738,
+movshon.FreemanZiemba2013,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013.csv,de0e65a25c7de4c1740f48ac9b1ff513dcfa5caf,
+movshon.FreemanZiemba2013,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013.zip,bdfc3ba2d878d6aeaa842f9de6abeae50922f2f2,
 dicarlo.objectome.public,stimulus_set,StimulusSet,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_objectome_public.csv,47884e17106a3be471d6481279cab33889b80850,
 dicarlo.objectome.public,stimulus_set,,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_objectome_public.zip,064f2955f98e63867755fee2e3ead8cddf6bfab8,
 dicarlo.objectome.private,stimulus_set,StimulusSet,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_objectome_private.csv,ac38e8f7c08fa8294ed25a3bf84a6adb108bf3fc,
@@ -15,22 +15,22 @@ dicarlo.Kar2019,stimulus_set,StimulusSet,S3,https://brainio.dicarlo.s3.amazonaws
 dicarlo.Kar2019,stimulus_set,,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_Kar2019.zip,75ab7b8b499fc8e86c813f717b79d268bcb986be,
 dicarlo.Kar2018cocogray,stimulus_set,StimulusSet,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_Kar2018cocogray.csv,be9bb267b80fd7ee36a88d025b73ae8a849165da,
 dicarlo.Kar2018cocogray,stimulus_set,,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_Kar2018cocogray.zip,1457003ee9b27ed51c018237009fe148c6e71fd3,
-dicarlo.hvm-public,stimulus_set,StimulusSet,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm-public.csv,3eff77e18169cca7cf20b74b4af47418b8ab5d51,
-dicarlo.hvm-public,stimulus_set,,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm-public.zip,e73d4c87db8358dd94168bda4bf608d2aedb5d33,
-dicarlo.hvm-private,stimulus_set,StimulusSet,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm-private.csv,52b84facedde59f59784526d7c58c92a1120658f,
-dicarlo.hvm-private,stimulus_set,,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm-private.zip,a8c25f295bff3792a3453e35a9261197a4629a64,
-movshon.FreemanZiemba2013-public,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013-public.csv,e9b9ec6ead4221e4badff4f6587430fa7bdfa5b0,
-movshon.FreemanZiemba2013-public,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013-public.zip,2bfb2111a5feabd54524976b4479ca83c37b05be,
-movshon.FreemanZiemba2013-private,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013-private.csv,b8aeb2bd93b446bcc2ff69ccf7e508b862834ff0,
-movshon.FreemanZiemba2013-private,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013-private.zip,de043154afcdea4d1dddf2fadd6ad4437ca6414e,
+dicarlo.hvm-public,stimulus_set,StimulusSet,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm-public.csv,5ca7a3da00d8e9c694a9cd725df5ba0ad6d735af,
+dicarlo.hvm-public,stimulus_set,,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm-public.zip,8aa44e038d7b551efa8077467622f9d48d72e473,
+dicarlo.hvm-private,stimulus_set,StimulusSet,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm-private.csv,6ff4981722fa05feb73a2bd26bbbba8b50dc29a6,
+dicarlo.hvm-private,stimulus_set,,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_hvm-private.zip,d7b1ca1876dad87e15b0242b4c82c0203ff3cbd3,
+movshon.FreemanZiemba2013-public,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013-public.csv,b4fee824f361fa0b78d7247ed4192b04cd675d4f,
+movshon.FreemanZiemba2013-public,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013-public.zip,e14d691db081ace829f76bb24dfc055a4fa2eaf9,
+movshon.FreemanZiemba2013-private,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013-private.csv,91bab3340410ff5171490a337c5931545f29da82,
+movshon.FreemanZiemba2013-private,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013-private.zip,c2adb4c0f2f0fbbc6006a879234740131ed2dcbb,
 klab.Zhang2018.search_obj_array,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_klab_Zhang2018_search_obj_array.csv,e9c2f6b35b84256242d257e8d36261aa26d3ed4a,
 klab.Zhang2018.search_obj_array,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_klab_Zhang2018_search_obj_array.zip,d92dfb20a87bb9a015c77c2862a215e8fa4f2cc3,
-movshon.FreemanZiemba2013.aperture-public,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture-public.csv,ea161beecbb11249bf153108eb4b145b6eacec90,
-movshon.FreemanZiemba2013.aperture-public,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture-public.zip,59051aebcf1c2b507671a68f1752bfa89a444d66,
-movshon.FreemanZiemba2013.aperture-private,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture-private.csv,b6dc1d208677d1c1fa0aebf75d6e86b52cd040f2,
-movshon.FreemanZiemba2013.aperture-private,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture-private.zip,7ee966bf4d3216cb832efa7a80882e772db1d5b7,
-movshon.FreemanZiemba2013.aperture,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture.csv,8bd931dbc2a398bde127dffd634ece2cd79c4a7b,
-movshon.FreemanZiemba2013.aperture,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture.zip,bd27693456988d698643e01f7e4925b7f25905fa,
+movshon.FreemanZiemba2013.aperture-public,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture-public.csv,194c9b301a4e3e9cff02481d4c19b39331d52660,
+movshon.FreemanZiemba2013.aperture-public,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture-public.zip,ad3c6c237491485c863acd2f4d2f219f737e424c,
+movshon.FreemanZiemba2013.aperture-private,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture-private.csv,65bee31483dd743ae2a19c6af03b9abe5f4d5a41,
+movshon.FreemanZiemba2013.aperture-private,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture-private.zip,0015c94e01d037994cdde1b2e3d169ab99f380dc,
+movshon.FreemanZiemba2013.aperture,stimulus_set,StimulusSet,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture.csv,4205eca54974da46accba7812fce25c1b6df58e0,
+movshon.FreemanZiemba2013.aperture,stimulus_set,,S3,https://brainio.contrib.s3.amazonaws.com/image_movshon_FreemanZiemba2013_aperture.zip,ab07880a0770bd73f68bcd5fd34e6cd945ee17fc,
 dicarlo.Rajalingham2020orthographic_IT,stimulus_set,StimulusSet,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_Rajalingham2020orthographic_IT.csv,3ac9ab73b653ac9cf839f9bfde131354a3766ccd,
 dicarlo.Rajalingham2020orthographic_IT,stimulus_set,,S3,https://brainio.dicarlo.s3.amazonaws.com/image_dicarlo_Rajalingham2020orthographic_IT.zip,0e025f6f8b06e803a6d8d1a17bd25a41af3e81db,
 dicarlo.MajajHong2015,assembly,NeuronRecordingAssembly,S3,https://brainio.dicarlo.s3.amazonaws.com/assy_dicarlo_MajajHong2015.nc,bf8f8d01010d727e3db3f85a9bd5f95f9456b7ec,dicarlo.hvm

migrations/convert_db_to_csv_20200728.py

@@ -11,8 +11,9 @@
 def repackage_stimulus_sets():
     for identifier in stimuli.list_stimulus_sets():
         stimulus_set = brainio_collection.get_stimulus_set(identifier)
-        if identifier.startswith('movshon'):
-            stimulus_set['image_path_within_store'] = stimulus_set['image_file_name']
+        if identifier.startswith('movshon') or identifier.startswith('dicarlo.hvm'):
+            filenames = stimulus_set['image_file_name'].apply(lambda s: s.replace('.png', ''))
+            stimulus_set['image_path_within_store'] = filenames
         # re-assign bucket
         stimulus_set_model = stimuli.StimulusSetModel.get(stimuli.StimulusSetModel.name == identifier)
         location = stimulus_set_model.stimulus_set_image_maps[0].image.image_image_store_maps[0].image_store.location